Bug 1161565 - Give titlebar proper appearance on OS X Yosemite and revmoe special case of double click behavior on unified tabbar on OS X. r=gijs, a=lizzard
authorXidorn Quan <quanxunzhen@gmail.com>
Tue, 06 Oct 2015 22:17:41 +1100
changeset 298082 e9d716c60d3769f50e305531c82b4b4c48b99e60
parent 298081 3902adefa47c767da4aa55e238633018f3560da0
child 298083 228866eb07ab001458dacbe16d35010303cbb344
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs, lizzard
bugs1161565
milestone43.0a2
Bug 1161565 - Give titlebar proper appearance on OS X Yosemite and revmoe special case of double click behavior on unified tabbar on OS X. r=gijs, a=lizzard
browser/base/content/tabbrowser.xml
browser/themes/osx/browser.css
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -5313,23 +5313,21 @@
           else
             this._handleNewTab(tab);
         } else if (tab.closing) {
           this.tabbrowser._endRemoveTab(tab);
         }
       ]]></handler>
 
       <handler event="dblclick"><![CDATA[
-        if (gBrowser.AppConstants.platform != "macosx") {
-          // When the tabbar has an unified appearance with the titlebar
-          // and menubar, a double-click in it should have the same behavior
-          // as double-clicking the titlebar
-          if (TabsInTitlebar.enabled || this.parentNode._dragBindingAlive)
-            return;
-        }
+        // When the tabbar has an unified appearance with the titlebar
+        // and menubar, a double-click in it should have the same behavior
+        // as double-clicking the titlebar
+        if (TabsInTitlebar.enabled || this.parentNode._dragBindingAlive)
+          return;
 
         if (event.button != 0 ||
             event.originalTarget.localName != "box")
           return;
 
         // See hack note in the tabbrowser-close-tab-button binding
         if (!this._blockDblClick)
           BrowserOpenTab();
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -93,22 +93,16 @@
     margin-left: 7px;
   }
 }
 
 #main-window:not(:-moz-lwtheme) > #titlebar {
   -moz-appearance: -moz-window-titlebar;
 }
 
-@media (-moz-mac-yosemite-theme) {
-  #main-window:not(:-moz-lwtheme) > #titlebar {
-    -moz-appearance: -moz-mac-vibrancy-light;
-  }
-}
-
 #main-window:not([tabsintitlebar]) > #titlebar {
   height: 22px; /* The native titlebar on OS X is 22px tall. */
 }
 
 /**
  * For tabs in titlebar on OS X, we stretch the titlebar down so that the
  * tabstrip can overlap it.
  */