Bug 1521277 - Port bug 1241885: Implement support for -moz-window-dragging in GTK and remove toolkit toolbar-drag binding. r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Sat, 19 Jan 2019 09:52:30 +0100
changeset 34244 e50aae1924854cc3db1211f564c1531bc633b086
parent 34243 c79237b13f9acde0e0a1e7f5d1a18492bc9d3858
child 34245 609c28fdc2a75d7459f159c83f7f3bbd882cb587
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersjorgk
bugs1521277, 1241885
Bug 1521277 - Port bug 1241885: Implement support for -moz-window-dragging in GTK and remove toolkit toolbar-drag binding. r=jorgk DONTBUILD
common/bindings/toolbar.xml
mail/base/content/bindings.css
mail/themes/linux/mail/tabmail.css
--- a/common/bindings/toolbar.xml
+++ b/common/bindings/toolbar.xml
@@ -489,24 +489,16 @@
       <handler event="mousedown" button="2" action="this._contextMenuListener.init(event);"/>
       <handler event="DOMMenuBarInactive"><![CDATA[
         if (!this._contextMenuListener.active)
           this._setInactiveAsync();
       ]]></handler>
     </handlers>
   </binding>
 
-  <binding id="toolbar-drag"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar">
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar">
-#endif
-  </binding>
-
   <binding id="menubar" role="xul:menubar" display="xul:menubar">
     <implementation>
        <field name="_active">false</field>
        <field name="_statusbar">null</field>
        <field name="_originalStatusText">null</field>
        <property name="statusbar" onget="return this.getAttribute('statusbar');"
                                   onset="this.setAttribute('statusbar', val); return val;"/>
        <method name="_updateStatusText">
--- a/mail/base/content/bindings.css
+++ b/mail/base/content/bindings.css
@@ -14,22 +14,16 @@
 toolbox {
   -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbox");
 }
 
 toolbar {
   -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar");
 }
 
-@media (-moz-menubar-drag) {
-  toolbox > toolbar[type="menubar"]:not([autohide="true"]) {
-    -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar-drag");
-  }
-}
-
 %ifndef XP_MACOSX
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar-menubar-autohide");
 }
 %endif
 
 toolbarbutton[type="menu-button"] {
   -moz-binding: url("chrome://messenger/content/toolbar.xml#menu-button");
--- a/mail/themes/linux/mail/tabmail.css
+++ b/mail/themes/linux/mail/tabmail.css
@@ -13,17 +13,17 @@
 }
 
 #tabs-toolbar {
   -moz-appearance: none;
   padding: 0;
 }
 
 #tabs-toolbar {
-  -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar-drag");
+  -moz-window-dragging: drag;
 }
 
 #tabs-toolbar:not(:-moz-lwtheme) {
   -moz-appearance: menubar;
   color: -moz-menubartext;
 }
 
 :root[tabsintitlebar][sizemode=normal] #mail-toolbar-menubar2[autohide=true] ~