From cd2c3eea42ea3ce8cb91d7783e99c2c7ba7f4f37 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 27 Apr 2005 18:01:09 +0000 Subject: 2005-04-27 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI (getThumbBounds): Do not make thumb smaller than minimumThumbSize. * javax/swing/plaf/metal/MetalLookAndFeel (initComponentDefaults): Added color defaults for ScrollBar. * javax/swing/plaf/metal/MetalScrollBarUI (paintThumb): Added. (getMinimumThumbSize): Added. 2005-04-27 Roman Kennke * javax/swing/plaf/metal/MetalLookAndFeel (initComponentDefaults): Added some default colors. 2005-04-27 Roman Kennke * 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-04-27 Roman Kennke * java/awt/MediaTracker.java: Added 2005 to copyright statement. * javax/swing/BoxLayout.java: Likewise. * javax/swing/UIManager.java: Likewise. * javax/swing/plaf/basic/BasicButtonListener.java: Likewise. * javax/swing/plaf/basic/BasicGraphicsUtils.java: Likewise. * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicScrollPaneUI.java: Likewise. * javax/swing/plaf/metal/MetalLookAndFeel.java: Likewise. * javax/swing/text/Document.java: Likewise. * javax/swing/text/GapContent.java: Likewise. * javax/swing/text/SimpleAttributeSet.java: Likewise. * javax/swing/tree/DefaultTreeSelectionModel.java: Likewise. 2005-04-27 Roman Kennke * javax/swing/plaf/basic/BasicToggleButtonUI.java: (getPropertyPrefix): Added. 2005-04-27 Roman Kennke * javax/swing/plaf/basic/BasicButtonUI.java (getPropertyPrefix): Added. (installDefaults): Use getPropertyPrefix instead of hard-coded prefix. 2005-04-27 Roman Kennke * javax/swing/JToggleButton.java (JToggleButton): Removed horizontalAlignment setting, this was wrong. Added setting of an actionCommand, ToggleButtons have "" as default actionCommand. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98867 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/javax/swing/plaf/basic/BasicButtonUI.java | 26 +++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'libjava/javax/swing/plaf/basic/BasicButtonUI.java') 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); } -- cgit v1.2.1