Patching scrollbar look

xpfe/global/resources/skin/xul.css

@@ -292,27 +292,20 @@ scrollbar[value="hidden"] {
 
 /********* XP Scrollbar *********/
 
-button.scrollbar-thumb {
-   user-focus: ignore;
-   background-color: #CCCCCC;
-   border: 1px outset white;
-   list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif")
+thumb {
+  behavior: url(resource:/chrome/xulBindings.xml#thumb);
+  user-focus: ignore;
+  background-color: #CCCCCC;
+  border: 1px outset #CCCCCC;
+  list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif")
 }
 
-/*
-pinkerton - workaround. removed until bug 15722 can be fixed.
-button.scrollbar-thumb:hover {
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz-hover.gif);
-}
-*/
-
-button.scrollbar-thumb[disabled="true"] {
+thumb[disabled="true"] {
    user-focus: ignore;
    list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
 }
 
-button.scrollbar-thumb[align="vertical"] {
-   user-focus: ignore;
+thumb[align="vertical"] {
    list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif")
 }
 
@@ -398,7 +391,6 @@ grippy {
    display: block;
 }
 
-
 /********** checkbox **********/
 
 checkbox {

xpfe/global/resources/skin/xulBindings.xml

@@ -5,17 +5,21 @@
    xmlns:html="http://www.w3.org/TR/REC-html40"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
+  <binding name="thumb" extends="xul:box">
+    <content>
+      <xul:spring flex="1"/>
+		  <xul:image inherits="src"/>
+		  <xul:spring flex="1"/>
+    </content>
+  </binding>
+
   <binding name="scrollbar">
     <content>
       <xul:scrollbarbutton type="decrement">
-	    <xul:image inherits="src"/>
-	  </xul:scrollbarbutton>
+	      <xul:image inherits="src"/>
+	    </xul:scrollbarbutton>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
-	    <xul:button class="scrollbar-thumb" inherits="align" flex="1">
-		  <xul:spring flex="1"/>
-		  <xul:image inherits="src"/>
-		  <xul:spring flex="1"/>
-		</xul:button>
+	      <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>
       <xul:scrollbarbutton type="increment">
 	    <xul:image inherits="src"/>