Bug 864034 - [Mac][personas] lightweight theming crunches window title bar. r+moa=Mnyromyr. a=IanN SEAMONKEY_2_18b4_BUILD1 SEAMONKEY_2_18b4_RELEASE
authorstefanh@inbox.com
Wed, 24 Apr 2013 20:06:58 +0200
changeset 15012 af57b546646654638a27cc13876950097c2abdb8
parent 15008 165a30811b0505cd4efd71506f595b817c7c051c
child 15013 9a973a7c2740d4d091b67b416708a197783d98d6
child 15015 b5bc06acc4f8a5eeb65deac5370de19f1710ae6f
push idunknown
push userunknown
push dateunknown
reviewersIanN
bugs864034
Bug 864034 - [Mac][personas] lightweight theming crunches window title bar. r+moa=Mnyromyr. a=IanN
editor/ui/composer/content/editor.xul
suite/browser/navigator.xul
suite/common/downloads/downloadmanager.xul
suite/debugQA/content/debugQATextEditorShell.xul
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/compose/messengercompose.xul
suite/mailnews/messageWindow.xul
suite/mailnews/messenger.xul
suite/themes/classic/mac/communicator/communicator.css
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -124,16 +124,18 @@
     <key id="showHideSidebar"/>
     <!-- eat these tab events here to stop focus from moving -->
     <key keycode="VK_TAB" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="shift" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="control" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="control,shift" oncommand="return true;"/>
   </keyset>
 
+  <vbox id="titlebar"/>
+
   <toolbox class="toolbox-top" id="EditorToolbox">
   <menubar id="main-menubar" class="chromeclass-menubar" persist="collapsed" grippytooltiptext="&menuBar.tooltip;">
     <menu id="menu_File"/>
     <menu id="menu_Edit"/>
 
     <menu id="menu_View">
     <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
     <menupopup id="menu_View_Popup">
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -134,16 +134,18 @@
     <!-- Items are generated, see popupBlockerMenuShowing() -->
     <menupopup id="popupNotificationMenu"/>
     <menupopup id="networkProperties"/>
   </popupset>
 
   <!-- context menu -->
   <popupset id="contentAreaContextSet"/>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true"
            mode="full" defaultmode="full">
     <!-- Menu -->
     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar"
              persist="collapsed" grippytooltiptext="&menuBar.tooltip;" customizable="true"
              defaultset="menubar-items"
              mode="icons" iconsize="small"
              defaultmode="icons" defaulticonsize="small"
--- a/suite/common/downloads/downloadmanager.xul
+++ b/suite/common/downloads/downloadmanager.xul
@@ -160,16 +160,18 @@
                 label="&cmd.properties.label;"
                 accesskey="&cmd.properties.accesskey;"
                 command="cmd_properties"/>
       <menuseparator/>
       <menuitem id="cMenu_selectAll"/>
     </menupopup>
   </popupset>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="download-toolbox">
     <menubar id="download-menubar"
              grippytooltiptext="&menuBar.tooltip;">
       <menu id="menu_File">
         <menupopup id="menu_FilePopup">
           <menuitem id="dlMenu_open"
                     label="&cmd.open.label;"
                     accesskey="&cmd.open.accesskey;"
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -73,16 +73,18 @@
   <!-- keys are appended from the overlay -->
   <keyset id="editorKeys">
     <keyset id="tasksKeys"/>
     <key id="showHideSidebar"/>
   </keyset>
 
   <popupset id="contentAreaContextSet"/>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="EditorToolbox">
     <menubar id="main-menubar" class="chromeclass-menubar">
       <menu id="menu_File"/>
       <menu id="menu_Edit"/>
 
       <menu id="menu_View">
         <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
         <menupopup id="menu_View_Popup">
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -183,16 +183,18 @@
   <menuitem id="abResultsTreeContext-delete"
             label="&deleteItemButton.label;"
             accesskey="&deleteItemButton.accesskey;"
             command="button_delete"/>
 </menupopup>
 
 <menupopup id="toolbar-context-menu"/>
 
+<vbox id="titlebar"/>
+
 <toolbox id="ab-toolbox"
          mode="full"
          defaultmode="full"
          class="toolbox-top">
   <toolbar type="menubar"
            id="addrbook-toolbar-menubar2"
            class="chromeclass-menubar"
            persist="collapsed"
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -176,16 +176,18 @@
                 accesskey="&attachFile.accesskey;"
                 command="cmd_attachFile"/>
       <menuitem label="&attachPage.label;"
                 accesskey="&attachPage.accesskey;"
                 command="cmd_attachPage"/>
     </menupopup>
   </popupset>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="compose-toolbox"
            class="toolbox-top"
            mode="full"
            defaultmode="full">
     <toolbar id="compose-toolbar-menubar2"
              type="menubar"
              class="chromeclass-menubar"
              persist="collapsed"
--- a/suite/mailnews/messageWindow.xul
+++ b/suite/mailnews/messageWindow.xul
@@ -91,16 +91,18 @@
     <menupopup id="messageIdContext"/>
     <menupopup id="emailAddressPopup"/>
     <menupopup id="toolbar-context-menu"/>
     <tooltip id="aHTMLTooltip"
              onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
     <panel id="customizeToolbarSheetPopup"/>
   </popupset>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="mail-toolbox">
     <toolbar id="mail-toolbar-menubar2">
       <toolbaritem id="menubar-items">
         <menubar id="mail-menubar"/>
       </toolbaritem>
     </toolbar>
     <toolbar id="msgToolbar"/>
     <toolbarset id="customToolbars"/>
--- a/suite/mailnews/messenger.xul
+++ b/suite/mailnews/messenger.xul
@@ -105,16 +105,18 @@
     <menupopup id="emailAddressPopup"/>
     <menupopup id="toolbar-context-menu"/>
     <tooltip id="folderpopup" class="folderSummaryPopup"/>
     <tooltip id="aHTMLTooltip"
              onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
     <panel id="customizeToolbarSheetPopup"/>
   </popupset>
 
+  <vbox id="titlebar"/>
+
   <toolbox id="mail-toolbox" class="toolbox-top">
     <toolbar id="mail-toolbar-menubar2">
       <toolbaritem id="menubar-items">
         <menubar id="mail-menubar"/>
       </toolbaritem>
     </toolbar>
     <toolbar id="msgToolbar"/>
     <toolbarset id="customToolbars"/>
--- a/suite/themes/classic/mac/communicator/communicator.css
+++ b/suite/themes/classic/mac/communicator/communicator.css
@@ -9,16 +9,25 @@
 @import url("chrome://global/skin/");
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
 @import url("chrome://communicator/skin/toolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+window:not([drawintitlebar="true"]) > #titlebar {
+  display: none;
+}
+
+#titlebar {
+  height: 22px;
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+}
+
 /* ::::: toolbar-primary ::::: */
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
 }
 
 /* ::::: grippies ::::: */