Bug 248330: toolbar buttons aren't flush with the top of the screen in full screen mode, r=mano, ui-r=beltzner

browser/base/content/browser.js

@@ -3422,18 +3422,16 @@ var FullScreen =
     var XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
     var els = document.getElementsByTagNameNS(XULNS, aTag);
 
-    var i, savedMode, savedIconSize;
-    for (i = 0; i < els.length; ++i) {
+    for (var i = 0; i < els.length; ++i) {
       // XXX don't interfere with previously collapsed toolbars
       if (els[i].getAttribute("fullscreentoolbar") == "true") {
         if (!aShow) {
-          var toolbarMode = els[i].getAttribute("mode");
-          var iconSize = els[i].getAttribute("iconsize");
-          var contextMenu = els[i].getAttribute("context");
 
+          var toolbarMode = els[i].getAttribute("mode");
           if (toolbarMode != "text") {
             els[i].setAttribute("saved-mode", toolbarMode);
-            els[i].setAttribute("saved-iconsize", iconSize);
+            els[i].setAttribute("saved-iconsize",
+                                els[i].getAttribute("iconsize"));
             els[i].setAttribute("mode", "icons");
             els[i].setAttribute("iconsize", "small");
           }
@@ -3441,28 +3439,29 @@ var FullScreen =
           // XXX See bug 202978: we disable the context menu
           // to prevent customization while in fullscreen, which
           // causes menu breakage.
-          els[i].setAttribute("saved-context", contextMenu);
+          els[i].setAttribute("saved-context",
+                              els[i].getAttribute("context"));
           els[i].removeAttribute("context");
+
+          // Set the inFullscreen attribute to allow specific styling
+          // in fullscreen mode
+          els[i].setAttribute("inFullscreen", true);
         }
         else {
-          if (els[i].hasAttribute("saved-mode")) {
-            savedMode = els[i].getAttribute("saved-mode");
-            els[i].setAttribute("mode", savedMode);
-            els[i].removeAttribute("saved-mode");
+          function restoreAttr(attrName) {
+            var savedAttr = "saved-" + attrName;
+            if (els[i].hasAttribute(savedAttr)) {
+              var savedValue = els[i].getAttribute(savedAttr);
+              els[i].setAttribute(attrName, savedValue);
+              els[i].removeAttribute(savedAttr);
+            }
           }
 
-          if (els[i].hasAttribute("saved-iconsize")) {
-            savedIconSize = els[i].getAttribute("saved-iconsize");
-            els[i].setAttribute("iconsize", savedIconSize);
-            els[i].removeAttribute("saved-iconsize");
-          }
+          restoreAttr("mode");
+          restoreAttr("iconsize");
+          restoreAttr("context"); // XXX see above
 
-          // XXX see above.
-          if (els[i].hasAttribute("saved-context")) {
-            var savedContext = els[i].getAttribute("saved-context");
-            els[i].setAttribute("context", savedContext);
-            els[i].removeAttribute("saved-context");
-          }
+          els[i].removeAttribute("inFullscreen");
         }
       } else {
         // use moz-collapsed so it doesn't persist hidden/collapsed,
@@ -3473,38 +3472,18 @@ var FullScreen =
           els[i].setAttribute("moz-collapsed", "true");
       }
     }
+
+    var toolbox = document.getElementById("navigator-toolbox");
+    if (aShow)
+      toolbox.removeAttribute("inFullscreen");
+    else
+      toolbox.setAttribute("inFullscreen", true);
+
 #ifndef XP_MACOSX
     var controls = document.getElementsByAttribute("fullscreencontrol", "true");
-    for (i = 0; i < controls.length; ++i)
+    for (var i = 0; i < controls.length; ++i)
       controls[i].hidden = aShow;
 #endif
-
-    // XXXvladimir this was a fix for bug 174174, but I don't think it's necessary
-    // any more?
-    var toolbox = document.getElementById("navigator-toolbox");
-    if (!aShow) {
-      var toolboxMode = toolbox.getAttribute("mode");
-      var toolboxIconSize = toolbox.getAttribute("iconsize");
-      if (toolboxMode != "text") {
-        toolbox.setAttribute("saved-mode", toolboxMode);
-        toolbox.setAttribute("saved-iconsize", toolboxIconSize);
-        toolbox.setAttribute("mode", "icons");
-        toolbox.setAttribute("iconsize", "small");
-      }
-      else {
-        if (toolbox.hasAttribute("saved-mode")) {
-          savedMode = toolbox.getAttribute("saved-mode");
-          toolbox.setAttribute("mode", savedMode);
-          toolbox.removeAttribute("saved-mode");
-        }
-
-        if (toolbox.hasAttribute("saved-iconsize")) {
-          savedIconSize = toolbox.getAttribute("saved-iconsize");
-          toolbox.setAttribute("iconsize", savedIconSize);
-          toolbox.removeAttribute("saved-iconsize");
-        }
-      }
-    }
   }
 };
 

browser/themes/winstripe/browser/browser.css

@@ -86,6 +86,11 @@
   visibility: hidden;
 }
 
+#navigator-toolbox[inFullscreen="true"],
+#navigator-toolbox[inFullscreen="true"] > #nav-bar {
+  border-top: none;
+}
+
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item {
@@ -789,11 +794,8 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
-  -moz-box-align: center;
-  padding-top: 0px;
-  padding-bottom: 0px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  -moz-box-align: start;
+  padding: 0;
   border-left: 2px solid;
   -moz-border-left-colors: ThreeDHighlight ThreeDShadow;
 }

toolkit/content/fullScreen.js

@@ -1,94 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt <hewitt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var FullScreen = 
-{
-  toggle: function()
-  {
-    // show/hide all menubars, toolbars, and statusbars (except the full screen toolbar)
-    this.showXULChrome("menubar", window.fullScreen);
-    this.showXULChrome("toolbar", window.fullScreen);
-    this.showXULChrome("statusbar", window.fullScreen);
-  },
-  
-  showXULChrome: function(aTag, aShow)
-  {
-    var XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-    var els = document.getElementsByTagNameNS(XULNS, aTag);
-    
-    var i;
-    for (i = 0; i < els.length; ++i) {
-      // XXX don't interfere with previously collapsed toolbars
-      if (els[i].getAttribute("fullscreentoolbar") == "true") {
-        this.setToolbarButtonMode(els[i], aShow ? "" : "small");
-      } else {
-        // use moz-collapsed so it doesn't persist hidden/collapsed,
-        // so that new windows don't have missing toolbars
-        if (aShow)
-          els[i].removeAttribute("moz-collapsed");
-        else
-          els[i].setAttribute("moz-collapsed", "true");
-      }
-    }
-
-#ifndef XP_MACOSX
-    var controls = document.getElementsByAttribute("fullscreencontrol", "true");
-    for (i = 0; i < controls.length; ++i)
-      controls[i].hidden = aShow;
-#endif
-  },
-  
-  setToolbarButtonMode: function(aToolbar, aMode)
-  {
-    aToolbar.setAttribute("toolbarmode", aMode);
-    this.setToolbarButtonModeFor(aToolbar, "toolbarbutton", aMode);
-    this.setToolbarButtonModeFor(aToolbar, "button", aMode);
-    this.setToolbarButtonModeFor(aToolbar, "textbox", aMode);
-  },
-  
-  setToolbarButtonModeFor: function(aToolbar, aTag, aMode)
-  {
-    var XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-    var els = aToolbar.getElementsByTagNameNS(XULNS, aTag);
-
-    for (var i = 0; i < els.length; ++i) {
-      els[i].setAttribute("toolbarmode", aMode);
-    }
-  }
-  
-};