diff options
Diffstat (limited to 'libjava/javax/swing/plaf/basic')
8 files changed, 45 insertions, 59 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/javax/swing/plaf/basic/BasicButtonListener.java index 350db3bedd8..3a81e3ff91c 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonListener.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.java @@ -1,5 +1,5 @@ /* BasicButtonListener.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java index 15b715b3a7c..6c0ac38b86b 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java @@ -107,17 +107,29 @@ public class BasicButtonUI extends ButtonUI textShiftOffset = defaultTextShiftOffset; } + /** + * Returns the prefix for the UI defaults property for this UI class. + * This is 'Button' for this class. + * + * @return the prefix for the UI defaults property + */ + protected String getPropertyPrefix() + { + return "Button"; + } + protected void installDefaults(AbstractButton b) { UIDefaults defaults = UIManager.getLookAndFeelDefaults(); - focusColor = defaults.getColor("Button.focus"); - b.setForeground(defaults.getColor("Button.foreground")); - b.setBackground(defaults.getColor("Button.background")); - b.setMargin(defaults.getInsets("Button.margin")); - b.setBorder(defaults.getBorder("Button.border")); - b.setIconTextGap(defaults.getInt("Button.textIconGap")); + String prefix = getPropertyPrefix(); + focusColor = defaults.getColor(prefix + ".focus"); + b.setForeground(defaults.getColor(prefix + ".foreground")); + b.setBackground(defaults.getColor(prefix + ".background")); + b.setMargin(defaults.getInsets(prefix + ".margin")); + b.setBorder(defaults.getBorder(prefix + ".border")); + b.setIconTextGap(defaults.getInt(prefix + ".textIconGap")); b.setInputMap(JComponent.WHEN_FOCUSED, - (InputMap) defaults.get("Button.focusInputMap")); + (InputMap) defaults.get(prefix + ".focusInputMap")); b.setOpaque(true); } diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java index 07be39d0652..7eef7760f98 100644 --- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java +++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java @@ -1,5 +1,5 @@ /* BasicGraphicsUtils.java - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java index 958ce277dbc..ee9f64b6f56 100644 --- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java +++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java @@ -1,5 +1,5 @@ /* BasicLookAndFeel.java -- - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java index 50af23ac641..ae8b6c54c9d 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -1,5 +1,5 @@ /* BasicMenuItemUI.java -- - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java index a7de70101dc..b7c5074aad5 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java @@ -499,7 +499,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, 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"); } /** @@ -743,7 +743,8 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, thumbRect.x += (value - min) * trackRect.width / (max - min); thumbRect.y = trackRect.y; - thumbRect.width = extent * trackRect.width / (max - min); + thumbRect.width = Math.max(extent * trackRect.width / (max - min), + getMinimumThumbSize().width); thumbRect.height = trackRect.height; } else @@ -752,7 +753,8 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, thumbRect.y = trackRect.y + value * trackRect.height / (max - min); thumbRect.width = trackRect.width; - thumbRect.height = extent * trackRect.height / (max - min); + thumbRect.height = Math.max(extent * trackRect.height / (max - min), + getMinimumThumbSize().height); } return thumbRect; } @@ -1034,53 +1036,15 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, */ 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); } /** diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java index da924bb49c8..938548aeb58 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java @@ -1,5 +1,5 @@ /* BasicScrollPaneUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java index 1dc6423ee76..677e6a575d3 100644 --- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java @@ -1,5 +1,5 @@ /* BasicToggleButtonUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,5 +48,15 @@ public class BasicToggleButtonUI extends BasicButtonUI return new BasicToggleButtonUI(); } + /** + * Returns the prefix for the UI defaults property for this UI class. + * This is 'ToggleButton' for this class. + * + * @return the prefix for the UI defaults property + */ + protected String getPropertyPrefix() + { + return "ToggleButton"; + } } |
