Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 996148 - With tabs in titlebar disabled, the private browsing mask can be incorrectly positioned in certain modes. r=MattN.

Browse Source 
The positioning of the private browsing mask depends on us correctly setting the fullscreen placeholder
width. Unfortunately, we only ever did that when kicking off the tabs-in-titlebar code. This patch makes
it so that we set the width regardless of whether or not tabs in titlebar is enabled.
This commit is contained in:
Mike Conley 2014-04-15 14:11:19 -04:00
parent 3802bdf07b
commit 9a1d4ffe2d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4464,6 +4464,9 @@ var TabsInTitlebar = {
let titlebar = $("titlebar");
let titlebarContent = $("titlebar-content");
let menubar = $("toolbar-menubar");
#ifdef XP_MACOSX
let secondaryButtonsWidth = rect($("titlebar-secondary-buttonbox")).width;
#endif
if (allowed) {
// We set the tabsintitlebar attribute first so that our CSS for
@ -4481,7 +4484,6 @@ var TabsInTitlebar = {
let captionButtonsBoxWidth = rect($("titlebar-buttonbox-container")).width;
#ifdef XP_MACOSX
let secondaryButtonsWidth = rect($("titlebar-secondary-buttonbox")).width;
// No need to look up the menubar stuff on OS X:
let menuHeight = 0;
let fullMenuHeight = 0;
@ -4556,9 +4558,6 @@ var TabsInTitlebar = {
// Finally, size the placeholders:
#ifdef XP_MACOSX
this._sizePlaceholder("fullscreen-button", secondaryButtonsWidth);
#endif
this._sizePlaceholder("caption-buttons", captionButtonsBoxWidth);
if (!this._draghandles) {
@ -4586,6 +4585,10 @@ var TabsInTitlebar = {
titlebar.style.marginBottom = "";
menubar.style.paddingBottom = "";
}
#ifdef XP_MACOSX
this._sizePlaceholder("fullscreen-button", secondaryButtonsWidth);
#endif
},
_sizePlaceholder: function (type, width) {