Bug 394299 - UI to provide access to extension options from app options cut off (also fixes bug 393945). r=mano

browser/components/preferences/main.xul

@@ -211,10 +211,10 @@
       </hbox>
     </groupbox>
 #endif
-    <groupbox id="addonsMgrGroup" orient="horizontal">
+    <hbox class="bottomBox">
-      <caption label="&addonsMgr.label;"/>
+      <groupbox id="addonsMgrGroup" orient="horizontal" flex="1">
+        <caption label="&addonsMgr.label;"/>
 
-      <hbox align="center" flex="1">
         <description control="manageAddons"
 #ifdef XP_WIN
                      flex="1">&manageAddonsDesc.label;</description>
@@ -224,8 +224,8 @@
         <button id="manageAddons" label="&manageAddons.label;"
                 accesskey="&manageAddons.accesskey;"
                 oncommand="gMainPane.showAddonsMgr();"/>
-      </hbox>
+      </groupbox>
-    </groupbox>
+    </hbox>
 
   </prefpane>
 

browser/components/preferences/security.xul

@@ -163,18 +163,17 @@
     </groupbox>
 
     <!-- Warning Messages -->
-    <groupbox id="warningMessagesGroup">
+    <hbox class="bottomBox">
-      <caption label="&warnings.label;"/>
+      <groupbox id="warningMessagesGroup" orient="horizontal" flex="1">
+        <caption label="&warnings.label;"/>
 
-      <hbox id="chooseWarningsBox" align="center">
         <description control="warningSettings" flex="1">&chooseWarnings.label;</description>
         <button id="warningSettings"
                 label="&warningSettings.label;"
                 accesskey="&warningSettings.accesskey;"
                 oncommand="gSecurityPane.showWarningMessageSettings();"/>
-      </hbox>
+      </groupbox>
-      <separator/>
+    </hbox>
-    </groupbox>
 
   </prefpane>
 

browser/locales/en-US/chrome/browser/preferences/preferences.dtd

@@ -1,7 +1,9 @@
 
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
-<!ENTITY  prefWindow.styleWin     "width: 42em; height: 40em;">
+<!-- When making changes to prefWindow.styleWin test both Windows Classic and
+     Luna since widget heights are different based on the OS theme -->
+<!ENTITY  prefWindow.styleWin     "width: 42em; height: 44em;">
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 42em; height: 38.5em;">
 

browser/themes/winstripe/browser/preferences/preferences.css

@@ -264,3 +264,9 @@ filefield[disabled="true"] .fileFieldIcon {
 #chooseClientAppCell {
   -moz-padding-end: 12px;
 }
+
+/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
+   of the groupbox from being cutoff */
+.bottomBox {
+  padding-bottom: 2px;
+}