Bug 997227 - Entering and exiting tabview makes items in tabs toolbar collide with fullscreen button. r=Gijs, MattN.
authorMike Conley <mconley@mozilla.com>
Wed, 16 Apr 2014 19:48:01 -0400
changeset 197465 5b8b5f3b200f9aa635c3fe82fe8541f252eadd14
parent 197464 c94117f49274f5fb719f761d7dd961cf8e5c52ac
child 197466 a80a58607a35e2c7e892a276bb0dff81ab88d082
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, MattN
bugs997227
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 997227 - Entering and exiting tabview makes items in tabs toolbar collide with fullscreen button. r=Gijs, MattN.
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4579,16 +4579,20 @@ var TabsInTitlebar = {
 
         this._draghandles.navToolbox = new tmp.WindowDraggingElement(gNavToolbox);
         this._draghandles.navToolbox.mouseDownCheck = mouseDownCheck;
       }
     } else {
       document.documentElement.removeAttribute("tabsintitlebar");
       updateTitlebarDisplay();
 
+#ifdef XP_MACOSX
+      let secondaryButtonsWidth = rect($("titlebar-secondary-buttonbox")).width;
+      this._sizePlaceholder("fullscreen-button", secondaryButtonsWidth);
+#endif
       // Reset the margins and padding that might have been modified:
       titlebarContent.style.marginTop = "";
       titlebarContent.style.marginBottom = "";
       titlebar.style.marginBottom = "";
       menubar.style.paddingBottom = "";
     }
   },