diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-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 |
4 files changed, 15 insertions, 16 deletions
@@ -1,5 +1,15 @@ 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. + +2007-04-03 Roman Kennke <roman@kennke.org> + * native/target/.cvsignore, * native/target/Linux/.cvsignore, * native/target/generic/.cvsignore: Some new ignores. 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); |