Bug 977217 - [Australis] Clicking API-widget borders in the menu panel does nothing. r=Gijs
authorJared Wein <jwein@mozilla.com>
Fri, 07 Mar 2014 19:14:31 -0500
changeset 172655 4dab55a994e50e3b3309cbeece616e36ed280410
parent 172654 5c01409eccd5816567683486101ab59e3983d1f6
child 172656 363beb46bd10390842b7afc6f81d9bca7bb8f31a
push id26372
push userphilringnalda@gmail.com
push dateSun, 09 Mar 2014 01:41:44 +0000
treeherdermozilla-central@21f293fc8d34 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs977217
milestone30.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 977217 - [Australis] Clicking API-widget borders in the menu panel does nothing. r=Gijs
browser/components/customizableui/content/panelUI.xml
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -268,28 +268,23 @@
           }
           switch (aEvent.type) {
             case "click":
               if (aEvent.originalTarget == this._clickCapturer) {
                 this.showMainView();
               }
               break;
             case "overflow":
-              switch (aEvent.target.localName) {
-                case "vbox":
-                  // Resize the right view on the next tick.
-                  if (this.showingSubView) {
-                    setTimeout(this._syncContainerWithSubView.bind(this), 0);
-                  } else if (!this.transitioning) {
-                    setTimeout(this._syncContainerWithMainView.bind(this), 0);
-                  }
-                  break;
-                case "toolbarbutton":
-                  aEvent.target.setAttribute("fadelabel", "true");
-                  break;
+              if (aEvent.target.localName == "vbox") {
+                // Resize the right view on the next tick.
+                if (this.showingSubView) {
+                  setTimeout(this._syncContainerWithSubView.bind(this), 0);
+                } else if (!this.transitioning) {
+                  setTimeout(this._syncContainerWithMainView.bind(this), 0);
+                }
               }
               break;
             case "popupshowing":
               this.setAttribute("panelopen", "true");
               // Bug 941196 - The panel can get taller when opening a subview. Disabling
               // autoPositioning means that the panel won't jump around if an opened
               // subview causes the panel to exceed the dimensions of the screen in the
               // direction that the panel originally opened in. This property resets
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -117,20 +117,21 @@
 .cui-widget-panel > .panel-arrowcontainer > .panel-arrowcontent > .popup-internal-box {
   padding: 0;
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
   -moz-hyphens: auto;
   line-height: 1.1;
+  max-height: 2.2em;
 }
 
-.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1[fadelabel] > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
-.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1[fadelabel] > .toolbarbutton-multiline-text {
+.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
+.panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text {
   position: absolute;
   clip: rect(auto, auto, 2.2em, auto);
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-text,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
   text-align: center;
   margin: 2px 0 0;
@@ -215,24 +216,16 @@ toolbarbutton[sdk-button="true"][cui-are
   -moz-appearance: none;
   -moz-box-orient: vertical;
   width: calc(@menuPanelButtonWidth@ - 2px);
   height: calc(49px + 2.2em);
   margin-top: 3px; /* Hack needed to get type=menu-button to properly align vertically. */
   border: 0;
 }
 
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item),
-.panelUI-grid .toolbarbutton-1:not([type="menu-button"]),
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.customization-palette .toolbarbutton-1,
-.panel-customization-placeholder-child {
-  overflow: hidden;
-}
-
 .panel-customization-placeholder-child {
   margin: 6px 0 0;
   padding: 2px 6px;
   border: 1px solid transparent;
 }
 
 .panelUI-grid .toolbarbutton-1[type="menu"] {
   background-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");