Bug 1507382 - Show titlebar items when menubar enabled. r=dao
authorMike Conley <mconley@mozilla.com>
Wed, 21 Nov 2018 15:09:31 +0000
changeset 506686 adab030a385aa769613b3825073b3ba96af65a68
parent 506685 6ce32daf80793ae70f50cfdd421aad837e155435
child 506687 6b6edb2ff1249947406191d293a498385b64319b
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1507382
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507382 - Show titlebar items when menubar enabled. r=dao Differential Revision: https://phabricator.services.mozilla.com/D12236
browser/base/content/browser.css
browser/base/content/browser.xul
browser/base/content/titlebar-items.inc.xul
browser/themes/windows/browser.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -278,17 +278,17 @@ window:not([chromehidden~="toolbar"]) #n
  */
 #widget-overflow-list:empty + #widget-overflow-fixed-separator,
 #widget-overflow:not([hasfixeditems]) #widget-overflow-fixed-separator {
   display: none;
 }
 
 
 %ifdef MENUBAR_CAN_AUTOHIDE
-#toolbar-menubar:not([autohide=true]) + #TabsToolbar > .titlebar-item,
+#toolbar-menubar:not([autohide=true]) + #TabsToolbar > .titlebar-buttonbox-container,
 #toolbar-menubar:not([autohide=true]) + #TabsToolbar .titlebar-spacer,
 %endif
 %ifndef MOZ_WIDGET_COCOA
 #main-window:not([sizemode=normal]) .titlebar-spacer[type="pre-tabs"],
 %endif
 #main-window:not([chromemargin]) .titlebar-buttonbox-container,
 #main-window[inFullscreen] .titlebar-buttonbox-container,
 #main-window[inFullscreen] .titlebar-spacer,
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -785,20 +785,20 @@ xmlns="http://www.w3.org/1999/xhtml"
 
             <hbox class="titlebar-spacer" type="post-tabs"
                   ordinal="1000"
                   skipintoolbarset="true"/>
           </hbox>
         </vbox>
 
 #ifndef XP_MACOSX
-        <button class="accessibility-indicator titlebar-item"  tooltiptext="&accessibilityIndicator.tooltip;"
+        <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
                 ordinal="1000"
                 aria-live="polite" skipintoolbarset="true"/>
-        <hbox class="private-browsing-indicator titlebar-item" skipintoolbarset="true"
+        <hbox class="private-browsing-indicator" skipintoolbarset="true"
               ordinal="1000"/>
 #endif
 
 #include titlebar-items.inc.xul
 
 #ifdef XP_MACOSX
         <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
              buttonbox from reversing order in RTL by forcing an LTR direction. -->
--- a/browser/base/content/titlebar-items.inc.xul
+++ b/browser/base/content/titlebar-items.inc.xul
@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<hbox class="titlebar-buttonbox-container titlebar-item">
+<hbox class="titlebar-buttonbox-container">
   <hbox class="titlebar-buttonbox titlebar-color">
     <toolbarbutton class="titlebar-button titlebar-min" oncommand="window.minimize();"/>
     <toolbarbutton class="titlebar-button titlebar-max" oncommand="onTitlebarMaxClick();"/>
     <toolbarbutton class="titlebar-button titlebar-close" command="cmd_closeWindow"/>
   </hbox>
 </hbox>
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -954,17 +954,17 @@ notification[value="translation"] {
   transform: perspective(0.01px);
 }
 
 /* End customization mode */
 
 /* Prevent titlebar items (window caption buttons, private browsing indicator,
  * accessibility indicator, etc) from overlapping the nav bar's shadow on the
  * tab bar. */
-#TabsToolbar > .titlebar-item {
+#TabsToolbar > .titlebar-buttonbox-container {
   margin-bottom: @navbarTabsShadowSize@;
 }
 
 :root:not([privatebrowsingmode=temporary]) .accessibility-indicator,
 .private-browsing-indicator {
   margin-inline-end: 12px;
 }