Bug 1122942 - Move -moz-window-dragging rules to places that are theme-independent. r=dao, a=lmandel
authorMarkus Stange <mstange@themasta.com>
Fri, 23 Jan 2015 13:07:54 -0500
changeset 243054 31817089230d
parent 243049 59aa16cfd49f
child 243055 b57b609d03a7
push id4377
push userryanvm@gmail.com
push date2015-01-26 23:19 +0000
treeherdermozilla-beta@1d3c24b896a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao, lmandel
bugs1122942
milestone36.0
Bug 1122942 - Move -moz-window-dragging rules to places that are theme-independent. r=dao, a=lmandel
browser/base/content/browser.css
browser/themes/osx/browser.css
toolkit/content/xul.css
toolkit/themes/osx/global/global.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -187,16 +187,20 @@ toolbar[customizing] > .overflow-button 
 #main-window[inFullscreen] > #titlebar,
 #main-window[inFullscreen] .titlebar-placeholder,
 #main-window:not([tabsintitlebar]) .titlebar-placeholder {
   display: none;
 }
 
 #titlebar {
   -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+
+%ifdef XP_MACOSX
+  -moz-window-dragging: drag;
+%endif
 }
 
 #titlebar-spacer {
   pointer-events: none;
 }
 
 #main-window[tabsintitlebar] #titlebar-buttonbox {
   position: relative;
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -70,20 +70,16 @@
 
 #main-window {
   -moz-appearance: none;
   background-color: #eeeeee;
 }
 
 /** Begin titlebar **/
 
-#titlebar {
-  -moz-window-dragging: drag;
-}
-
 #titlebar-buttonbox > .titlebar-button {
   display: none;
 }
 
 /* NB: these would be -moz-margin-start/end if it wasn't for the fact that OS X
  * doesn't reverse the order of the items in the titlebar in RTL mode. */
 .titlebar-placeholder[type="caption-buttons"],
 #titlebar-buttonbox {
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -237,16 +237,38 @@ caption {
 }
 
 .groupbox-body {
   -moz-box-pack: inherit;
   -moz-box-align: inherit;
   -moz-box-orient: vertical;
 }
 
+/******** draggable elements *********/
+
+%ifdef XP_MACOSX
+titlebar,
+toolbar:not([nowindowdrag="true"]):not([customizing="true"]),
+statusbar:not([nowindowdrag="true"]),
+windowdragbox {
+  -moz-window-dragging: drag;
+}
+
+/* The list below is non-comprehensive and will probably need some tweaking. */
+toolbarbutton,
+button,
+textbox,
+searchbar,
+tab,
+radio,
+splitter {
+  -moz-window-dragging: no-drag;
+}
+%endif
+
 /******* toolbar *******/
 
 toolbox {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox");
   -moz-box-orient: vertical;
 }
 
 toolbar {
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -9,36 +9,16 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 menulist > menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
 
-/* ::::: draggable elements ::::: */
-
-titlebar,
-toolbar:not([nowindowdrag="true"]):not([customizing="true"]),
-statusbar:not([nowindowdrag="true"]),
-windowdragbox {
-  -moz-window-dragging: drag;
-}
-
-/* The list below is non-comprehensive and will probably need some tweaking. */
-toolbarbutton,
-button,
-textbox,
-searchbar,
-tab,
-radio,
-splitter {
-  -moz-window-dragging: no-drag;
-}
-
 /* ::::: root elements ::::: */
 
 window,
 page,
 dialog,
 wizard,
 prefwindow { 
   -moz-appearance: dialog;