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 179398 5b8b5f3b200f9aa635c3fe82fe8541f252eadd14
parent 179397 c94117f49274f5fb719f761d7dd961cf8e5c52ac
child 179399 a80a58607a35e2c7e892a276bb0dff81ab88d082
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersGijs, MattN
bugs997227
milestone31.0a1
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 = "";
     }
   },