Bug 1693263 - Port bug 1693196: Remove use of -moz-default-appearance: -moz-mac-fullscreen-button. r=mkmelin

mail/base/content/messageWindow.xhtml

@@ -213,7 +213,6 @@
           <toolbarbutton class="titlebar-button" id="titlebar-close" oncommand="window.close()"/>
         </hbox>
       </hbox>
-      <hbox id="titlebar-fullscreen-button"/>
     </hbox>
   </vbox>
 #endif

mail/base/content/messenger.xhtml

@@ -499,9 +499,6 @@
         <toolbarbutton class="titlebar-button" id="titlebar-close" oncommand="window.close()"/>
       </hbox>
     </hbox>
-#ifdef XP_MACOSX
-    <hbox id="titlebar-fullscreen-button"/>
-#endif
   </hbox>
 </vbox>
 
@@ -584,9 +581,6 @@
       </toolbarbutton>
 
       <hbox class="titlebar-placeholder" type="caption-buttons"/>
-#ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
-#endif
     </toolbar>
 
   </toolbox>

mail/base/content/msgMail3PaneWindow.js

@@ -2128,11 +2128,6 @@ var TabsInTitlebar = {
     }
 
     if (!drawInTitlebar) {
-      if (AppConstants.platform == "macosx") {
-        let secondaryButtonsWidth = rect($("titlebar-fullscreen-button")).width;
-        this._sizePlaceholder("fullscreen-button", secondaryButtonsWidth);
-      }
-
       // Reset styles that might have been modified:
       titlebar.style.marginBottom = "";
       menubar.style.paddingBottom = "";
@@ -2164,9 +2159,8 @@ var TabsInTitlebar = {
     // Buttons first:
     let captionButtonsBoxWidth = rect(titlebarButtons).width;
 
-    let secondaryButtonsWidth, menuHeight, fullMenuHeight, menuStyles;
+    let menuHeight, fullMenuHeight, menuStyles;
     if (AppConstants.platform == "macosx") {
-      secondaryButtonsWidth = rect($("titlebar-fullscreen-button")).width;
       // No need to look up the menubar stuff on OS X:
       menuHeight = 0;
       fullMenuHeight = 0;
@@ -2245,9 +2239,6 @@ var TabsInTitlebar = {
     titlebar.style.marginBottom = "-" + maxTitlebarOrTabsHeight + "px";
 
     // Finally, size the placeholders:
-    if (AppConstants.platform == "macosx") {
-      this._sizePlaceholder("fullscreen-button", secondaryButtonsWidth);
-    }
     this._sizePlaceholder("caption-buttons", captionButtonsBoxWidth);
   },
 

mail/components/addrbook/content/addressbook.xhtml

@@ -294,7 +294,6 @@
       <hbox id="titlebar-title" align="center" flex="1">
         <label id="titlebar-title-label" value="&addressbookWindow.title;" flex="1"/>
       </hbox>
-      <hbox id="titlebar-fullscreen-button"/>
     </hbox>
   </vbox>
 #endif

mail/components/compose/content/messengercompose.xhtml

@@ -817,7 +817,6 @@
       <hbox id="titlebar-title" align="center" flex="1">
         <label id="titlebar-title-label" value="&msgComposeWindow.title;" flex="1" crop="end"/>
       </hbox>
-      <hbox id="titlebar-fullscreen-button"/>
     </hbox>
   </vbox>
 #endif

mail/themes/osx/mail/messenger.css

@@ -308,37 +308,22 @@ treecol.treecol-image:hover:active {
   margin-inline: 12px;
 }
 
-.titlebar-placeholder[type="fullscreen-button"],
-#titlebar-fullscreen-button {
-  margin-inline: 7px;
-}
-
-#titlebar-fullscreen-button {
-  appearance: auto;
-  -moz-default-appearance: -moz-mac-fullscreen-button;
-}
-
 #titlebar-buttonbox {
   appearance: auto;
   -moz-default-appearance: -moz-window-button-box;
 }
 
 /* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */
-#titlebar-fullscreen-button:-moz-locale-dir(ltr),
 #titlebar-buttonbox-container:-moz-locale-dir(rtl),
-.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr),
 .titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) {
   -moz-box-ordinal-group: 1000;
 }
 
-#titlebar-fullscreen-button:-moz-locale-dir(rtl),
 #titlebar-buttonbox-container:-moz-locale-dir(ltr),
-.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr),
-.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) {
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr) {
   -moz-box-ordinal-group: 0;
 }
 
-#messengerWindow[sizemode="fullscreen"] .titlebar-placeholder[type="fullscreen-button"],
 #messengerWindow[sizemode="fullscreen"] .titlebar-placeholder[type="caption-buttons"] {
   display: none;
 }

mail/themes/osx/mail/tabmail.css

@@ -19,7 +19,7 @@
 
 :root[tabsintitlebar][sizemode=normal] #navigation-toolbox > #tabs-toolbar >
   #tabbar-toolbar {
-  margin-inline-start: 40px;
+  margin-inline: 40px;
 }
 
 /**