From dfdf75882b8c4972fab46789642f9ed9e6649f0b Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Wed, 15 Mar 2000 03:06:46 +0000
Subject: [PATCH] Landing the new progressmeter.

---
 xpfe/global/resources/skin/global.css      | 17 ++++++++++----
 xpfe/global/resources/skin/xul.css         |  4 ++++
 xpfe/global/resources/skin/xulBindings.xml | 27 ++++++++++++++++++----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/xpfe/global/resources/skin/global.css b/xpfe/global/resources/skin/global.css
index 88f80e34323..e5787ee39ee 100644
--- a/xpfe/global/resources/skin/global.css
+++ b/xpfe/global/resources/skin/global.css
@@ -688,15 +688,22 @@ progressmeter[align="horizontal"] {
 	height: 1em;
 }
 
-progressmeter {
-	color : #9999CC;
+box.progress-bar {
+	background-color : #9999cc;
+}
+
+box.progress-remainder {
 	background-color: #999999;
 }
 
-progressmeter[mode="undetermined"]
+progressmeter[mode="undetermined"] > .internal-box
 {
-   //background-color: yellow;
-   background-image: url(chrome://global/skin/progressmeter-busy.gif);
+  background-image: url(chrome://global/skin/progressmeter-busy.gif);
+}
+
+progressmeter[mode="undetermined"] > .internal-box > stack > progressbar
+{
+  display: none;
 }
 
 /********* Box ********/
diff --git a/xpfe/global/resources/skin/xul.css b/xpfe/global/resources/skin/xul.css
index 751928791b1..34f0e59688a 100644
--- a/xpfe/global/resources/skin/xul.css
+++ b/xpfe/global/resources/skin/xul.css
@@ -80,6 +80,10 @@ toolbarseparator {
 
 /****** Progress Meter ********/
 
+progressmeter {
+  behavior: url("resource:/chrome/xulBindings.xml#progressmeter");
+}
+
 /****** TitledBox ******/
 
 /********* XP Menus ***********/
diff --git a/xpfe/global/resources/skin/xulBindings.xml b/xpfe/global/resources/skin/xulBindings.xml
index 71d1d4dc7e8..1e34af4a76b 100644
--- a/xpfe/global/resources/skin/xulBindings.xml
+++ b/xpfe/global/resources/skin/xulBindings.xml
@@ -141,7 +141,7 @@
 
   <binding name="buttonleft" excludes="observes,template">
     <content>
-	  <xul:box class="internal-box" autostretch="never">
+	  <xul:box flex="1" class="internal-box" autostretch="never">
         <xul:image inherits="src"/>
         <xul:text inherits="value,accesskey,crop"/>
       </xul:box>
@@ -150,7 +150,7 @@
   
   <binding name="buttontop" excludes="observes,template">
     <content>
-	  <xul:box orient="vertical" autostretch="never" class="internal-box">
+	  <xul:box flex="1" orient="vertical" autostretch="never" class="internal-box">
         <xul:image inherits="src"/>
         <xul:text inherits="value,accesskey,crop"/>
 	  </xul:box>
@@ -159,7 +159,7 @@
 
   <binding name="buttonright" excludes="observes,template">
     <content>
-	  <xul:box autostretch="never" class="internal-box">
+	  <xul:box flex="1" autostretch="never" class="internal-box">
 	    <xul:text inherits="value,accesskey,crop"/>
         <xul:image inherits="src"/>
       </xul:box>
@@ -168,7 +168,7 @@
 
   <binding name="buttonbottom" excludes="observes,template">
     <content>
-	  <xul:box orient="vertical" autostretch="never" class="internal-box">
+	  <xul:box flex="1" orient="vertical" autostretch="never" class="internal-box">
 	    <xul:text inherits="value,accesskey,crop"/>
         <xul:image inherits="src"/>
 	  </xul:box>
@@ -177,4 +177,23 @@
 
   <binding name="separator" extends="xul:spring"/>
 
+  <binding name="progressmeter" extends="xul:box">
+    <content excludes="observes,template">
+      <xul:box class="internal-box" flex="1">
+        <xul:stack flex="1">
+          <xul:progressbar inherits="value">
+            <xul:box class="progress-bar"/>
+            <xul:box class="progress-remainder"/>
+          </xul:progressbar>
+          <xul:box>
+            <xul:spring flex="1"/>
+            <xul:text class="progress-text" inherits="progresstext:value"/>
+            <xul:spring flex="1"/>
+          </xul:box>
+        </xul:stack>
+      </xul:box>
+    </content>
+  </binding>
+
+
 </bindings>