diff --git a/browser/modules/Windows8WindowFrameColor.jsm b/browser/modules/Windows8WindowFrameColor.jsm index 34e41fc17e48..a66080b2601e 100644 --- a/browser/modules/Windows8WindowFrameColor.jsm +++ b/browser/modules/Windows8WindowFrameColor.jsm @@ -9,7 +9,7 @@ this.EXPORTED_SYMBOLS = ["Windows8WindowFrameColor"]; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/WindowsRegistry.jsm"); +let Registry = Cu.import("resource://gre/modules/WindowsRegistry.jsm").WindowsRegistry; const Windows8WindowFrameColor = { _windowFrameColor: null, @@ -18,16 +18,26 @@ const Windows8WindowFrameColor = { if (this._windowFrameColor) return this._windowFrameColor; - let windowFrameColor = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\DWM", - "ColorizationColor"); + const HKCU = Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER; + const dwmKey = "Software\\Microsoft\\Windows\\DWM"; + let customizationColor = Registry.readRegKey(HKCU, dwmKey, + "ColorizationColor"); // The color returned from the Registry is in decimal form. - let windowFrameColorHex = windowFrameColor.toString(16); + let customizationColorHex = customizationColor.toString(16); // Zero-pad the number just to make sure that it is 8 digits. - windowFrameColorHex = ("00000000" + windowFrameColorHex).substr(-8); - let windowFrameColorArray = windowFrameColorHex.match(/../g); - let [pixelA, pixelR, pixelG, pixelB] = windowFrameColorArray.map(function(val) parseInt(val, 16)); + customizationColorHex = ("00000000" + customizationColorHex).substr(-8); + let customizationColorArray = customizationColorHex.match(/../g); + let [unused, fgR, fgG, fgB] = customizationColorArray.map(function(val) parseInt(val, 16)); + let colorizationColorBalance = Registry.readRegKey(HKCU, dwmKey, + "ColorizationColorBalance"); + // Window frame base color when Color Intensity is at 0, see bug 1004576. + let frameBaseColor = 217; + let alpha = colorizationColorBalance / 100; - return this._windowFrameColor = [pixelR, pixelG, pixelB]; + // Alpha-blend the foreground color with the frame base color. + let r = Math.round(fgR * alpha + frameBaseColor * (1 - alpha)); + let g = Math.round(fgG * alpha + frameBaseColor * (1 - alpha)); + let b = Math.round(fgB * alpha + frameBaseColor * (1 - alpha)); + return this._windowFrameColor = [r, g, b]; }, };