Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 21:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 968891 - Disable the button-text fade-out mask during the customization transition. r=Gijs

Browse Source
This commit is contained in:
Jared Wein 2014-02-07 13:17:58 -05:00
parent 65e17a8dce
commit 1f47656548
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/components/customizableui/src/CustomizeMode.jsm
View File

@ -189,6 +189,11 @@ CustomizeMode.prototype = {
// Hide the palette before starting the transition for increased perf.
this.visiblePalette.hidden = true;
// Disable the button-text fade-out mask
// during the transition for increased perf.
let panelContents = window.PanelUI.contents;
panelContents.setAttribute("customize-transitioning", "true");
// Move the mainView in the panel to the holder so that we can see it
// while customizing.
let mainView = window.PanelUI.mainView;
@ -253,6 +258,8 @@ CustomizeMode.prototype = {
this._updateEmptyPaletteNotice();
this._handler.isEnteringCustomizeMode = false;
panelContents.removeAttribute("customize-transitioning");
this.dispatchToolboxEvent("customizationready");
if (!this._wantToBeInCustomizeMode) {
this.exit();
@ -300,6 +307,11 @@ CustomizeMode.prototype = {
this.visiblePalette.hidden = true;
this.paletteEmptyNotice.hidden = true;
// Disable the button-text fade-out mask
// during the transition for increased perf.
let panelContents = window.PanelUI.contents;
panelContents.setAttribute("customize-transitioning", "true");
this._transitioning = true;
Task.spawn(function() {
@ -353,6 +365,8 @@ CustomizeMode.prototype = {
document.getElementById("PanelUI-help").removeAttribute("disabled");
document.getElementById("PanelUI-quit").removeAttribute("disabled");
panelContents.removeAttribute("customize-transitioning");
// We need to set this._customizing to false before removing the tab
// or the TabSelect event handler will think that we are exiting
// customization mode for a second time.

6
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -116,10 +116,14 @@
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
text-align: center;
-moz-hyphens: auto;
mask: url(chrome://browser/content/browser.xul#menuPanelButtonTextFadeOutMask);
min-height: 3.5em;
}
.panelUI-grid:not([customize-transitioning]) .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text {
mask: url(chrome://browser/content/browser.xul#menuPanelButtonTextFadeOutMask);
}
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
margin: 2px 0 0;
}