Bug 1058039 - Make sure that .addon-control subitem elements from Plugin Add-on Manager are not hidden (otherwise the state menu selectbox will not inherit a good width). r=Unfocused

toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js

@@ -57,10 +57,14 @@ function checkStateMenu(locked) {
   Assert.equal(Services.prefs.prefIsLocked(getTestPluginPref()), locked,
     "Preference lock state should be correct.");
   let menuList = gManagerWindow.document.getAnonymousElementByAttribute(gPluginElement, "anonid", "state-menulist");
+  //  State menu should always have a selected item which must be visible
+  let selectedMenuItem = menuList.querySelector(".addon-control[selected=\"true\"]");
 
   is_element_visible(menuList, "State menu should be visible.");
   Assert.equal(menuList.disabled, locked,
     "State menu should" + (locked === true ? "" : " not") + " be disabled.");
+
+  is_element_visible(selectedMenuItem, "State menu's selected item should be visible.");
 }
 
 function checkStateMenuDetail(locked) {

toolkit/themes/linux/mozapps/extensions/extensions.css

@@ -880,12 +880,12 @@ setting[type="radio"] > radiogroup {
 
 /*** buttons ***/
 
-.addon-control[disabled="true"] {
+.addon-control[disabled="true"]:not(.no-auto-hide) {
   display: none;
 }
 
-.addon-control.no-auto-hide {
-  display: block;
+.no-auto-hide .addon-control {
+  display: block !important;
 }
 
 .addon-control.enable {

toolkit/themes/osx/mozapps/extensions/extensions.css

@@ -1104,12 +1104,16 @@ setting[type="radio"] > radiogroup {
 
 /*** buttons ***/
 
-.addon-control[disabled="true"] {
+.addon-control[disabled="true"]:not(.no-auto-hide) {
   display: none;
 }
 
-.addon-control.no-auto-hide {
-  display: block;
+.no-auto-hide .addon-control {
+  display: block !important;
+}
+
+.no-auto-hide > .menulist-dropmarker {
+  -moz-padding-start: 0px !important;
 }
 
 button.button-link {

toolkit/themes/windows/mozapps/extensions/extensions.css

@@ -1120,12 +1120,12 @@ menulist { /* Fixes some styling inconsistencies */
 
 /*** buttons ***/
 
-.addon-control[disabled="true"] {
+.addon-control[disabled="true"]:not(.no-auto-hide) {
   display: none;
 }
 
-.addon-control.no-auto-hide {
-  display: block;
+.no-auto-hide .addon-control {
+  display: block !important;
 }
 
 button.button-link {