Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1496322 - Update window border colors for Windows 10 1809 update. r=Gijs

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D7718

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dão Gottwald 2018-10-11 12:31:07 +00:00
parent 7b4018cba7
commit 87fbb29107
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
browser/base/content/browser.js
View File

@ -63,6 +63,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
SitePermissions: "resource:///modules/SitePermissions.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
Translation: "resource:///modules/translation/Translation.jsm",
UITour: "resource:///modules/UITour.jsm",
@ -1250,15 +1251,28 @@ var gBrowserInit = {
new LightweightThemeConsumer(document);
CompactTheme.init();
if (window.matchMedia("(-moz-os-version: windows-win8)").matches &&
window.matchMedia("(-moz-windows-default-theme)").matches) {
let windowFrameColor = new Color(...ChromeUtils.import("resource:///modules/Windows8WindowFrameColor.jsm", {})
.Windows8WindowFrameColor.get());
// Default to black for foreground text.
if (!windowFrameColor.isContrastRatioAcceptable(new Color(0, 0, 0))) {
document.documentElement.setAttribute("darkwindowframe", "true");
if (AppConstants.platform == "win") {
if (window.matchMedia("(-moz-os-version: windows-win8)").matches &&
window.matchMedia("(-moz-windows-default-theme)").matches) {
let windowFrameColor = new Color(...ChromeUtils.import("resource:///modules/Windows8WindowFrameColor.jsm", {})
.Windows8WindowFrameColor.get());
// Default to black for foreground text.
if (!windowFrameColor.isContrastRatioAcceptable(new Color(0, 0, 0))) {
document.documentElement.setAttribute("darkwindowframe", "true");
}
} else if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) {
TelemetryEnvironment.onInitialized().then(() => {
// 17763 is the build number of Windows 10 version 1809
if (TelemetryEnvironment.currentEnvironment.system.os.windowsBuildNumber < 17763) {
document.documentElement.setAttribute("always-use-accent-color-for-window-border", "");
}
});
}
}
// Call this after we set attributes that might change toolbars' computed
// text color.
ToolbarIconColor.init();
},

21
browser/themes/windows/browser-aero.css
View File

@ -25,19 +25,17 @@
@media not all and (-moz-os-version: windows-win7) {
@media not all and (-moz-os-version: windows-win8) {
@media (-moz-windows-default-theme) {
:root[sizemode=normal][tabsintitlebar] {
border-top: 1px solid -moz-win-accentcolor;
}
:root[sizemode=normal][tabsintitlebar]:-moz-window-inactive {
border-top-color: rgba(0,0,0,.2);
}
:root:not(:-moz-lwtheme) {
background-color: hsl(0, 0%, 78%);
}
@media (-moz-windows-accent-color-in-titlebar: 0) {
:root[sizemode=normal][tabsintitlebar] {
border-top: 1px solid rgba(0,0,0,.7);
}
:root[sizemode=normal][tabsintitlebar][always-use-accent-color-for-window-border]:not(:-moz-window-inactive) {
border-top-color: -moz-win-accentcolor;
}
:root[tabsintitlebar]:not(:-moz-lwtheme) {
background-color: hsl(235,33%,19%);
}
@ -47,6 +45,9 @@
}
@media (-moz-windows-accent-color-in-titlebar) {
:root[sizemode=normal][tabsintitlebar] {
border-top: 1px solid -moz-win-accentcolor;
}
:root[tabsintitlebar]:not(:-moz-window-inactive):not(:-moz-lwtheme) {
background-color: -moz-win-accentcolor;
}
@ -55,6 +56,10 @@
}
}
:root[sizemode=normal][tabsintitlebar]:-moz-window-inactive {
border-top-color: rgba(0,0,0,.3);
}
:root[tabsintitlebar] .tab-label:-moz-window-inactive {
/* Calculated to match the opacity change of Windows Explorer
titlebar text change for inactive windows. */