corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1389744 - Stop repositioning pinned tabs when (un)selecting the Dark/Light theme. r=florian

Browse Source 
Dark/Light themes don't affect the tab strip layout anymore, so this entirely unnecessary work.

MozReview-Commit-ID: C37VZsd8r2J
This commit is contained in:
Dão Gottwald
2017-08-12 12:50:26 +02:00
parent ce8519ab57
commit e4aa04f0e6
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
browser/base/content/browser-compacttheme.js
View File

@@ -9,7 +9,6 @@
var CompactTheme = {
styleSheetLocation: "chrome://browser/skin/compacttheme.css",
styleSheet: null,
initialized: false,
get isStyleSheetEnabled() {
return this.styleSheet && !this.styleSheet.sheet.disabled;
@@ -23,7 +22,6 @@ var CompactTheme = {
},
init() {
this.initialized = true;
Services.obs.addObserver(this, "lightweight-theme-styling-update");
if (this.isThemeCurrentlyApplied) {
@@ -35,7 +33,6 @@ var CompactTheme = {
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;
},
@@ -56,21 +53,6 @@ var CompactTheme = {
}
},
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.themeLayoutChanged();
}
},
_toggleStyleSheet(enabled) {
let wasEnabled = this.isStyleSheetEnabled;
if (enabled) {
@@ -80,18 +62,13 @@ var CompactTheme = {
this.createStyleSheet();
}
this.styleSheet.sheet.disabled = false;
this.refreshBrowserDisplay();
} else if (!enabled && wasEnabled) {
this.styleSheet.sheet.disabled = true;
this.refreshBrowserDisplay();
}
},
uninit() {
Services.obs.removeObserver(this, "lightweight-theme-styling-update");
if (this.styleSheet) {
this.styleSheet.removeEventListener("load", this);
}
this.styleSheet = null;
}
};

11
browser/base/content/tabbrowser.xml
View File

@@ -6345,21 +6345,10 @@
]]></body>
</method>
<method name="themeLayoutChanged">
<body><![CDATA[
this._positionPinnedTabs(true);
]]></body>
</method>
<field name="_lastNumPinned">0</field>
<field name="_pinnedTabsLayoutCache">null</field>
<method name="_positionPinnedTabs">
<parameter name="aThemeLayoutChanged"/>
<body><![CDATA[
if (aThemeLayoutChanged) {
this._pinnedTabsLayoutCache = null;
}
var numPinned = this.tabbrowser._numPinnedTabs;
var doPosition = this.getAttribute("overflow") == "true" &&
numPinned > 0;