diff options
author | Roman Kennke <roman@kennke.org> | 2007-04-03 20:26:45 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2007-04-03 20:26:45 +0000 |
commit | 93c97c768f85f766eb1b1f7238b345070f8b2204 (patch) | |
tree | 89dc669e632981e9386197811c89e4e32e362cc7 /javax | |
parent | a015f47bae16d8c18d97f6a23ab3912ce9b242b2 (diff) | |
download | classpath-93c97c768f85f766eb1b1f7238b345070f8b2204.tar.gz |
2007-04-03 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalButtonUI.java
(paintButtonPressed): Fill the whole button not only visibleRect.
* javax/swing/plaf/metal/MetalLookAndFeel.java
(LAF_defaults): Removed.
(getDefaults): Always fetch super's defaults.
* javax/swing/plaf/metal/MetalMenuBarUI.java
(update): Don't leave 2 pixel gap.
Diffstat (limited to 'javax')
-rw-r--r-- | javax/swing/plaf/metal/MetalButtonUI.java | 3 | ||||
-rw-r--r-- | javax/swing/plaf/metal/MetalLookAndFeel.java | 16 | ||||
-rw-r--r-- | javax/swing/plaf/metal/MetalMenuBarUI.java | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/javax/swing/plaf/metal/MetalButtonUI.java b/javax/swing/plaf/metal/MetalButtonUI.java index be9607927..108b3b225 100644 --- a/javax/swing/plaf/metal/MetalButtonUI.java +++ b/javax/swing/plaf/metal/MetalButtonUI.java @@ -174,9 +174,8 @@ public class MetalButtonUI { if (b.isContentAreaFilled()) { - Rectangle area = b.getVisibleRect(); g.setColor(getSelectColor()); - g.fillRect(area.x, area.y, area.width, area.height); + g.fillRect(0, 0, b.getWidth(), b.getHeight()); } } diff --git a/javax/swing/plaf/metal/MetalLookAndFeel.java b/javax/swing/plaf/metal/MetalLookAndFeel.java index a9a679093..25c624b74 100644 --- a/javax/swing/plaf/metal/MetalLookAndFeel.java +++ b/javax/swing/plaf/metal/MetalLookAndFeel.java @@ -75,9 +75,6 @@ public class MetalLookAndFeel extends BasicLookAndFeel /** The current theme. */ private static MetalTheme theme; - /** The look and feel defaults. */ - private UIDefaults LAF_defaults; - /** * Creates a new instance of the Metal look and feel. */ @@ -151,17 +148,10 @@ public class MetalLookAndFeel extends BasicLookAndFeel public UIDefaults getDefaults() { createDefaultTheme(); - if (LAF_defaults == null) - { - LAF_defaults = super.getDefaults(); + UIDefaults def = super.getDefaults(); - // add custom theme entries to the table - if (theme != null) - theme.addCustomEntriesToTable(LAF_defaults); - } - - // Returns the default values for this look and feel. - return LAF_defaults; + theme.addCustomEntriesToTable(def); + return def; } /** diff --git a/javax/swing/plaf/metal/MetalMenuBarUI.java b/javax/swing/plaf/metal/MetalMenuBarUI.java index 40661946b..2cc52ed73 100644 --- a/javax/swing/plaf/metal/MetalMenuBarUI.java +++ b/javax/swing/plaf/metal/MetalMenuBarUI.java @@ -82,7 +82,7 @@ public class MetalMenuBarUI extends BasicMenuBarUI && c.getBackground() instanceof UIResource && height > 2) { - MetalUtils.paintGradient(g, 0, 0, c.getWidth(), height - 2, + MetalUtils.paintGradient(g, 0, 0, c.getWidth(), height, SwingConstants.VERTICAL, "MenuBar.gradient"); paint(g, c); |