[kaffe] CVS kaffe (robilad): resynced with gnu classpath : swing fix

[Kaffe CVS]

PatchSet 6482 
Date: 2005/05/15 11:07:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath : swing fix

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-27  Roman Kennke  <roman at kennke.org>

        * javax/swing/plaf/basic/BasicScrollBarUI.java
        (configureScrollBarColors: Changed key 'ScrollBar.thumbLightShadow'
        to 'ScrollBar.thumbShadow'. The formes does not exist.
        (paintThumb): Use BasicGraphicsUtils for painting the thumb.

Members: 
	ChangeLog:1.4008->1.4009 
	libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4008 kaffe/ChangeLog:1.4009
--- kaffe/ChangeLog:1.4008	Sun May 15 10:16:35 2005
+++ kaffe/ChangeLog	Sun May 15 11:07:00 2005
@@ -2,6 +2,17 @@
 
 	Resynced with GNU Classpath.
 
+	2005-04-27  Roman Kennke  <roman at kennke.org>
+
+        * javax/swing/plaf/basic/BasicScrollBarUI.java
+        (configureScrollBarColors: Changed key 'ScrollBar.thumbLightShadow'
+        to 'ScrollBar.thumbShadow'. The formes does not exist.
+        (paintThumb): Use BasicGraphicsUtils for painting the thumb.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-04-27  Chris Burdess  <dog at gnu.org>
 
         * java/net/protocol/http/HTTPURLConnection.java (connect): Accept
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12	Sun May 15 09:46:23 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java	Sun May 15 11:07:04 2005
@@ -499,7 +499,7 @@
     thumbColor = defaults.getColor("ScrollBar.thumb");
     thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
     thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
-    thumbLightShadowColor = defaults.getColor("ScrollBar.thumbLightShadow");
+    thumbLightShadowColor = defaults.getColor("ScrollBar.thumbShadow");
   }
 
   /**
@@ -1034,53 +1034,15 @@
    */
   protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds)
   {
-    Color saved = g.getColor();
-    Point x;
-    Point y;
-    Point z;
-    Polygon lines;
-
-    g.setColor(thumbHighlightColor);
-    x = new Point(thumbBounds.x + 1, thumbBounds.y + 1);
-    y = new Point(x);
-    y.translate(thumbBounds.width - 2, 0);
-    z = new Point(x);
-    z.translate(0, thumbBounds.height - 2);
-
-    lines = new Polygon(new int[] { x.x, y.x, z.x },
-                        new int[] { x.y, y.y, z.y }, 3);
-
-    g.drawPolygon(lines);
-
-    g.setColor(thumbLightShadowColor);
-    x = new Point(thumbBounds.x + thumbBounds.width - 1,
-                  thumbBounds.y + thumbBounds.height - 1);
-    y = new Point(x);
-    y.translate(-(thumbBounds.width - 2), 0);
-    z = new Point(x);
-    z.translate(0, -(thumbBounds.height - 2));
-
-    lines = new Polygon(new int[] { x.x, y.x, z.x },
-                        new int[] { x.y, y.y, z.y }, 3);
-    g.drawPolygon(lines);
-
-    g.setColor(thumbDarkShadowColor);
-    x = new Point(thumbBounds.x + thumbBounds.width,
-                  thumbBounds.y + thumbBounds.height);
-    y = new Point(x);
-    y.translate(-thumbBounds.width, 0);
-    z = new Point(x);
-    z.translate(0, -thumbBounds.height);
-
-    lines = new Polygon(new int[] { x.x, y.x, z.x },
-                        new int[] { x.y, y.y, z.y }, 3);
-    g.drawPolygon(lines);
-
     g.setColor(thumbColor);
     g.fillRect(thumbBounds.x, thumbBounds.y, thumbBounds.width,
                thumbBounds.height);
 
-    g.setColor(saved);
+    BasicGraphicsUtils.drawBezel(g, thumbBounds.x, thumbBounds.y,
+                                 thumbBounds.width, thumbBounds.height,
+                                 false, false, thumbDarkShadowColor,
+                                 thumbDarkShadowColor, thumbHighlightColor,
+                                 thumbHighlightColor);
   }
 
   /**