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 882009 - Invert updateTitlebarDisplay / TabsInTitlebar dependency. f=MattN r=Gijs

Browse Source 
--HG--
extra : rebase_source : 9575c1ba5cbda3445d174b6ed52c2eb8046501e1
This commit is contained in:
Dão Gottwald 2013-09-10 16:51:53 +02:00
parent 9030c8e31a
commit 7266e7e5df
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,10 +922,6 @@ var gBrowserInit = {
goSetCommandEnabled("cmd_newNavigatorTab", false);
}
#ifdef CAN_DRAW_IN_TITLEBAR
updateTitlebarDisplay();
#endif
// Misc. inits.
CombinedStopReload.init();
gPrivateBrowsingUI.init();
@ -2636,9 +2632,7 @@ var PrintPreviewListener = {
if (this._chromeState.sidebarOpen)
toggleSidebar(this._sidebarCommand);
#ifdef CAN_DRAW_IN_TITLEBAR
updateTitlebarDisplay();
#endif
TabsInTitlebar.allowedBy("print-preview", !gInPrintPreviewMode);
},
_hideChrome: function () {
this._chromeState = {};
@ -4365,6 +4359,7 @@ var TabsInTitlebar = {
// We set the tabsintitlebar attribute first so that our CSS for
// tabsintitlebar manifests before we do our measurements.
document.documentElement.setAttribute("tabsintitlebar", "true");
updateTitlebarDisplay();
// Try to avoid reflows in this code by calculating dimensions first and
// then later set the properties affecting layout together in a batch.
@ -4480,6 +4475,8 @@ var TabsInTitlebar = {
}
} else {
document.documentElement.removeAttribute("tabsintitlebar");
updateTitlebarDisplay();
// Reset the margins and padding that might have been modified:
titlebarContent.style.marginBottom = "";
titlebar.style.marginBottom = "";
@ -4504,10 +4501,9 @@ var TabsInTitlebar = {
#ifdef CAN_DRAW_IN_TITLEBAR
function updateTitlebarDisplay() {
let drawInTitlebar = !gInPrintPreviewMode && window.toolbar.visible;
document.getElementById("titlebar").hidden = !drawInTitlebar;
document.getElementById("titlebar").hidden = !TabsInTitlebar.enabled;
if (drawInTitlebar)
if (TabsInTitlebar.enabled)
#ifdef XP_WIN
document.documentElement.setAttribute("chromemargin", "0,2,2,2");
#else
@ -4515,8 +4511,6 @@ function updateTitlebarDisplay() {
#endif
else
document.documentElement.removeAttribute("chromemargin");
TabsInTitlebar.allowedBy("drawing-in-titlebar", drawInTitlebar);
}
#endif