From aeafe69b774029c794481199955881f594561d72 Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 12 Mar 2002 08:45:52 +0000
Subject: [PATCH] Fix for 129789, XBL form control selects need to leave space
 for scrollbars. r=bryner, sr=ben, a=brendan

git-svn-id: svn://10.0.0.236/trunk@116384 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/forms/resources/content/select.xml         | 6 +++---
 mozilla/layout/forms/resources/content/xbl-forms.css      | 3 +++
 mozilla/layout/html/forms/resources/content/select.xml    | 6 +++---
 mozilla/layout/html/forms/resources/content/xbl-forms.css | 3 +++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mozilla/layout/forms/resources/content/select.xml b/mozilla/layout/forms/resources/content/select.xml
index 8ff433c56b0..13d3678bae7 100644
--- a/mozilla/layout/forms/resources/content/select.xml
+++ b/mozilla/layout/forms/resources/content/select.xml
@@ -146,7 +146,7 @@
             <children/>
           </xul:outlinerchildren>
         </xul:hbox>
-        <xul:scrollbar orient="vertical" class="outliner-scrollbar" collapsed="true"/>
+        <xul:scrollbar orient="vertical" class="select-scrollbar" disabled="true"/>
       </xul:outlinerrows>
     </content>
 
@@ -614,13 +614,13 @@
     <handlers>
       <handler event="underflow">
         <![CDATA[
-          this.childNodes[1].collapsed = true;
+          this.childNodes[1].setAttribute("disabled", true);
           event.preventBubble();
         ]]>
       </handler>
       <handler event="overflow">
         <![CDATA[
-          this.childNodes[1].collapsed = false;
+          this.childNodes[1].removeAttribute("disabled");
           event.preventBubble();
         ]]>
       </handler>
diff --git a/mozilla/layout/forms/resources/content/xbl-forms.css b/mozilla/layout/forms/resources/content/xbl-forms.css
index 18fcb1efc76..aca84d8ecb6 100644
--- a/mozilla/layout/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/forms/resources/content/xbl-forms.css
@@ -74,6 +74,9 @@ xul|*.select-outlinerbody {
   display: -moz-box;
 }
 
+xul|*.select-scrollbar[disabled="true"] {
+  visibility: hidden;
+}
 
 input[type="checkbox"] {
   -moz-binding: url("chrome://forms/content/checkbox.xml#checkbox");
diff --git a/mozilla/layout/html/forms/resources/content/select.xml b/mozilla/layout/html/forms/resources/content/select.xml
index 8ff433c56b0..13d3678bae7 100644
--- a/mozilla/layout/html/forms/resources/content/select.xml
+++ b/mozilla/layout/html/forms/resources/content/select.xml
@@ -146,7 +146,7 @@
             <children/>
           </xul:outlinerchildren>
         </xul:hbox>
-        <xul:scrollbar orient="vertical" class="outliner-scrollbar" collapsed="true"/>
+        <xul:scrollbar orient="vertical" class="select-scrollbar" disabled="true"/>
       </xul:outlinerrows>
     </content>
 
@@ -614,13 +614,13 @@
     <handlers>
       <handler event="underflow">
         <![CDATA[
-          this.childNodes[1].collapsed = true;
+          this.childNodes[1].setAttribute("disabled", true);
           event.preventBubble();
         ]]>
       </handler>
       <handler event="overflow">
         <![CDATA[
-          this.childNodes[1].collapsed = false;
+          this.childNodes[1].removeAttribute("disabled");
           event.preventBubble();
         ]]>
       </handler>
diff --git a/mozilla/layout/html/forms/resources/content/xbl-forms.css b/mozilla/layout/html/forms/resources/content/xbl-forms.css
index 18fcb1efc76..aca84d8ecb6 100644
--- a/mozilla/layout/html/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/html/forms/resources/content/xbl-forms.css
@@ -74,6 +74,9 @@ xul|*.select-outlinerbody {
   display: -moz-box;
 }
 
+xul|*.select-scrollbar[disabled="true"] {
+  visibility: hidden;
+}
 
 input[type="checkbox"] {
   -moz-binding: url("chrome://forms/content/checkbox.xml#checkbox");