This commit does the following: * Install two lightweight themes instead of one * Introduce a build config to install the themes instead of relying on channel: INSTALL_COMPACT_THEMES * Change browser-compacttheme to use the new themes instead of the old one * Remove inferBrightness since the lwt colors are part of the compact theme definision, as opposed to the devedition theme which could be light or * Update CSS to use :-moz-lwtheme-darktext and :-moz-lwtheme-brighttext instead of [devtoolstheme] MozReview-Commit-ID: 4gKU68drlE2
124 lines
4.1 KiB
JavaScript
124 lines
4.1 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/**
|
|
* Listeners for the compact theme. This adds an extra stylesheet
|
|
* to browser.xul if a pref is set and no other themes are applied.
|
|
*/
|
|
var CompactTheme = {
|
|
_devtoolsThemePrefName: "devtools.theme",
|
|
styleSheetLocation: "chrome://browser/skin/compacttheme.css",
|
|
styleSheet: null,
|
|
initialized: false,
|
|
|
|
get isStyleSheetEnabled() {
|
|
return this.styleSheet && !this.styleSheet.sheet.disabled;
|
|
},
|
|
|
|
get isThemeCurrentlyApplied() {
|
|
let theme = LightweightThemeManager.currentTheme;
|
|
return theme && (
|
|
theme.id == "firefox-compact-dark@mozilla.org" ||
|
|
theme.id == "firefox-compact-light@mozilla.org");
|
|
},
|
|
|
|
init() {
|
|
this.initialized = true;
|
|
Services.prefs.addObserver(this._devtoolsThemePrefName, this, false);
|
|
Services.obs.addObserver(this, "lightweight-theme-styling-update", false);
|
|
this._updateDevtoolsThemeAttribute();
|
|
|
|
if (this.isThemeCurrentlyApplied) {
|
|
this._toggleStyleSheet(true);
|
|
}
|
|
},
|
|
|
|
createStyleSheet() {
|
|
let styleSheetAttr = `href="${this.styleSheetLocation}" type="text/css"`;
|
|
this.styleSheet = document.createProcessingInstruction(
|
|
"xml-stylesheet", styleSheetAttr);
|
|
this.styleSheet.addEventListener("load", this);
|
|
document.insertBefore(this.styleSheet, document.documentElement);
|
|
this.styleSheet.sheet.disabled = true;
|
|
},
|
|
|
|
observe(subject, topic, data) {
|
|
if (topic == "lightweight-theme-styling-update") {
|
|
let newTheme = JSON.parse(data);
|
|
if (newTheme && (
|
|
newTheme.id == "firefox-compact-light@mozilla.org" ||
|
|
newTheme.id == "firefox-compact-dark@mozilla.org")) {
|
|
// We are using the theme ID on this object instead of always referencing
|
|
// LightweightThemeManager.currentTheme in case this is a preview
|
|
this._toggleStyleSheet(true);
|
|
} else {
|
|
this._toggleStyleSheet(false);
|
|
}
|
|
|
|
}
|
|
|
|
if (topic == "nsPref:changed" && data == this._devtoolsThemePrefName) {
|
|
this._updateDevtoolsThemeAttribute();
|
|
}
|
|
},
|
|
|
|
_updateDevtoolsThemeAttribute() {
|
|
// Set an attribute on root element to make it possible
|
|
// to change colors based on the selected devtools theme.
|
|
let devtoolsTheme = Services.prefs.getCharPref(this._devtoolsThemePrefName);
|
|
if (devtoolsTheme != "dark") {
|
|
devtoolsTheme = "light";
|
|
}
|
|
document.documentElement.setAttribute("devtoolstheme", devtoolsTheme);
|
|
},
|
|
|
|
handleEvent(e) {
|
|
if (e.type === "load") {
|
|
this.styleSheet.removeEventListener("load", this);
|
|
this.refreshBrowserDisplay();
|
|
}
|
|
},
|
|
|
|
refreshBrowserDisplay() {
|
|
// Don't touch things on the browser if gBrowserInit.onLoad hasn't
|
|
// yet fired.
|
|
if (this.initialized) {
|
|
gBrowser.tabContainer._positionPinnedTabs();
|
|
}
|
|
},
|
|
|
|
_toggleStyleSheet(enabled) {
|
|
let wasEnabled = this.isStyleSheetEnabled;
|
|
if (enabled) {
|
|
// The stylesheet may not have been created yet if it wasn't
|
|
// needed on initial load. Make it now.
|
|
if (!this.styleSheet) {
|
|
this.createStyleSheet();
|
|
}
|
|
this.styleSheet.sheet.disabled = false;
|
|
this.refreshBrowserDisplay();
|
|
} else if (!enabled && wasEnabled) {
|
|
this.styleSheet.sheet.disabled = true;
|
|
this.refreshBrowserDisplay();
|
|
}
|
|
},
|
|
|
|
uninit() {
|
|
Services.prefs.removeObserver(this._devtoolsThemePrefName, this);
|
|
Services.obs.removeObserver(this, "lightweight-theme-styling-update");
|
|
if (this.styleSheet) {
|
|
this.styleSheet.removeEventListener("load", this);
|
|
}
|
|
this.styleSheet = null;
|
|
}
|
|
};
|
|
|
|
// If the compact theme is going to be applied in gBrowserInit.onLoad,
|
|
// then preload it now. This prevents a flash of unstyled content where the
|
|
// normal theme is applied while the compact theme stylesheet is loading.
|
|
if (AppConstants.INSTALL_COMPACT_THEMES &&
|
|
this != Services.appShell.hiddenDOMWindow && CompactTheme.isThemeCurrentlyApplied) {
|
|
CompactTheme.createStyleSheet();
|
|
}
|