wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 515196 - Added padding to toolbar autohide. r=dao

Browse Source
This commit is contained in:
Akshendra Pratap 2014-11-01 21:01:18 +01:00
parent 43fdd644b6
commit ccc28f9eaa
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
browser/base/content/browser-fullScreen.js
View File

@ -67,10 +67,6 @@ var FullScreen = {
this.showXULChrome("toolbar", !enterFS); this.showXULChrome("toolbar", !enterFS);
if (enterFS) { if (enterFS) {
if (gPrefService.getBoolPref("browser.fullscreen.autohide"))
gBrowser.mPanelContainer.addEventListener("mousemove",
this._collapseCallback, false);
document.addEventListener("keypress", this._keyToggleCallback, false); document.addEventListener("keypress", this._keyToggleCallback, false);
document.addEventListener("popupshown", this._setPopupOpen, false); document.addEventListener("popupshown", this._setPopupOpen, false);
document.addEventListener("popuphidden", this._setPopupOpen, false); document.addEventListener("popuphidden", this._setPopupOpen, false);
@ -79,9 +75,6 @@ var FullScreen = {
// mozfullscreenchange event fired, which could confuse content script. // mozfullscreenchange event fired, which could confuse content script.
this._shouldAnimate = !document.mozFullScreen; this._shouldAnimate = !document.mozFullScreen;
this.mouseoverToggle(false); this.mouseoverToggle(false);
// Autohide prefs
gPrefService.addObserver("browser.fullscreen", this, false);
} }
else { else {
// The user may quit fullscreen during an animation // The user may quit fullscreen during an animation
@ -185,12 +178,10 @@ var FullScreen = {
cleanup: function () { cleanup: function () {
if (window.fullScreen) { if (window.fullScreen) {
gBrowser.mPanelContainer.removeEventListener("mousemove", MousePosTracker.removeListener(this);
this._collapseCallback, false);
document.removeEventListener("keypress", this._keyToggleCallback, false); document.removeEventListener("keypress", this._keyToggleCallback, false);
document.removeEventListener("popupshown", this._setPopupOpen, false); document.removeEventListener("popupshown", this._setPopupOpen, false);
document.removeEventListener("popuphidden", this._setPopupOpen, false); document.removeEventListener("popuphidden", this._setPopupOpen, false);
gPrefService.removeObserver("browser.fullscreen", this);
this.cancelWarning(); this.cancelWarning();
gBrowser.tabContainer.removeEventListener("TabOpen", this.exitDomFullScreen); gBrowser.tabContainer.removeEventListener("TabOpen", this.exitDomFullScreen);
@ -204,18 +195,9 @@ var FullScreen = {
} }
}, },
observe: function(aSubject, aTopic, aData) getMouseTargetRect: function()
{ {
if (aData == "browser.fullscreen.autohide") { return this._mouseTargetRect;
if (gPrefService.getBoolPref("browser.fullscreen.autohide")) {
gBrowser.mPanelContainer.addEventListener("mousemove",
this._collapseCallback, false);
}
else {
gBrowser.mPanelContainer.removeEventListener("mousemove",
this._collapseCallback, false);
}
}
}, },
// Event callbacks // Event callbacks
@ -223,7 +205,7 @@ var FullScreen = {
{ {
FullScreen.mouseoverToggle(true); FullScreen.mouseoverToggle(true);
}, },
_collapseCallback: function() onMouseEnter: function()
{ {
FullScreen.mouseoverToggle(false); FullScreen.mouseoverToggle(false);
}, },
@ -512,22 +494,26 @@ var FullScreen = {
return; return;
} }
// The chrome is collapsed so don't spam needless mousemove events
if (aShow) {
gBrowser.mPanelContainer.addEventListener("mousemove",
this._collapseCallback, false);
}
else {
gBrowser.mPanelContainer.removeEventListener("mousemove",
this._collapseCallback, false);
}
// Hiding/collapsing the toolbox interferes with the tab bar's scrollbox, // Hiding/collapsing the toolbox interferes with the tab bar's scrollbox,
// so we just move it off-screen instead. See bug 430687. // so we just move it off-screen instead. See bug 430687.
gNavToolbox.style.marginTop = gNavToolbox.style.marginTop =
aShow ? "" : -gNavToolbox.getBoundingClientRect().height + "px"; aShow ? "" : -gNavToolbox.getBoundingClientRect().height + "px";
this._fullScrToggler.hidden = aShow || document.mozFullScreen; this._fullScrToggler.hidden = aShow || document.mozFullScreen;
if (aShow) {
let rect = gBrowser.mPanelContainer.getBoundingClientRect();
this._mouseTargetRect = {
top: rect.top + 50,
bottom: rect.bottom,
left: rect.left,
right: rect.right
};
MousePosTracker.addListener(this);
} else {
MousePosTracker.removeListener(this);
}
this._isChromeCollapsed = !aShow; this._isChromeCollapsed = !aShow;
if (gPrefService.getIntPref("browser.fullscreen.animateUp") == 2) if (gPrefService.getIntPref("browser.fullscreen.animateUp") == 2)
this._shouldAnimate = true; this._shouldAnimate = true;