[Pkg-mozext-commits] [greasemonkey] 04/21: Improve the size of the script preferences dialog.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit eccc46cea86f423a6f4cd718e183fcff2a6cc8b1
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Jul 15 16:58:06 2015 -0400

    Improve the size of the script preferences dialog.
    
    Start much smaller, allow the user to change the size, remember the size.
    
    Fixes #2191
---
 content/scriptprefs.xul | 22 ++++++++++++----------
 skin/scriptprefs.css    |  5 +++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/content/scriptprefs.xul b/content/scriptprefs.xul
index 0c1a05c..333f235 100644
--- a/content/scriptprefs.xul
+++ b/content/scriptprefs.xul
@@ -15,47 +15,49 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   buttons="accept,cancel"
+  id="greasemonkey-script-preferences"
   title="&scriptprefs.title;"
   ondialogaccept="return onDialogAccept();"
+  persist="width height"
 >
 
 <script type="application/x-javascript" src="chrome://greasemonkey/content/scriptprefs.js" />
 
-<tabbox>
+<tabbox flex="1">
   <tabs>
     <tab label="&scriptprefs.usersettings;" />
     <tab label="&scriptprefs.scriptsettings;" />
   </tabs>
-  <tabpanels>
-    <tabpanel>
+  <tabpanels flex="1">
+    <tabpanel flex="1">
       <vbox flex="1">
         <vbox flex="1" class="include">
           <label value="&label.grpIncluded;" />
-          <cludes id="user-includes"/>
+          <cludes flex="1" id="user-includes"/>
         </vbox>
         <vbox flex="1" class="match">
           <label value="&label.grpMatched;" />
-          <cludes id="user-matches"/>
+          <cludes flex="1" id="user-matches"/>
         </vbox>
         <vbox flex="1" class="exclude">
           <label value="&label.grpExcluded;" />
-          <cludes id="user-excludes" />
+          <cludes flex="1" id="user-excludes" />
         </vbox>
       </vbox>
     </tabpanel>
-    <tabpanel>
+    <tabpanel flex="1">
       <vbox flex="1">
         <vbox flex="1" class="include">
           <label value="&label.grpIncluded;" />
-          <cludes id="script-includes" class="readonly" />
+          <cludes flex="1" id="script-includes" class="readonly"/>
         </vbox>
         <vbox flex="1" class="match">
           <label value="&label.grpMatched;" />
-          <cludes id="script-matches" class="readonly" />
+          <cludes flex="1" id="script-matches" class="readonly"/>
         </vbox>
         <vbox flex="1" class="exclude">
           <label value="&label.grpExcluded;" />
-          <cludes id="script-excludes" class="readonly" />
+          <cludes flex="1" id="script-excludes" class="readonly"/>
         </vbox>
       </vbox>
     </tabpanel>
diff --git a/skin/scriptprefs.css b/skin/scriptprefs.css
index 5a5000e..e3851a8 100644
--- a/skin/scriptprefs.css
+++ b/skin/scriptprefs.css
@@ -1,3 +1,8 @@
 cludes {
+  /*
+  XUL flex will expand to an appropriate height.
+  Just don't start too tall.  (See #2191)
+  */
+  height: 0;
   min-width: 500px;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git