diff options
| author | Roman Kennke <roman@kennke.org> | 2005-04-19 07:59:01 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2005-04-19 07:59:01 +0000 |
| commit | 0e1c59840f70a153bf1286f5c7e517f4be9a43c1 (patch) | |
| tree | 74957abc0250090113349b4728f7576439fe01b6 /javax | |
| parent | 6007c697cca98f7aa79c9bab679860dfd7e441cc (diff) | |
| download | classpath-0e1c59840f70a153bf1286f5c7e517f4be9a43c1.tar.gz | |
2005-04-19 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicButtonUI.java
(paint): This should not care about margin and insets
at the same time, as insets already include the margin
through the border.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Likewise.
* javax/swing/plaf/metal/MetalBorders.java
(getBorderInsets): Likewise.
Diffstat (limited to 'javax')
| -rw-r--r-- | javax/swing/plaf/basic/BasicButtonUI.java | 6 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicGraphicsUtils.java | 9 | ||||
| -rw-r--r-- | javax/swing/plaf/metal/MetalBorders.java | 1 |
3 files changed, 6 insertions, 10 deletions
diff --git a/javax/swing/plaf/basic/BasicButtonUI.java b/javax/swing/plaf/basic/BasicButtonUI.java index ed352e767..15b715b3a 100644 --- a/javax/swing/plaf/basic/BasicButtonUI.java +++ b/javax/swing/plaf/basic/BasicButtonUI.java @@ -247,14 +247,12 @@ public class BasicButtonUI extends ButtonUI Rectangle tr = new Rectangle(); Rectangle ir = new Rectangle(); Rectangle vr = new Rectangle(); - Rectangle br = new Rectangle(); Font f = c.getFont(); g.setFont(f); - SwingUtilities.calculateInnerArea(b, br); - SwingUtilities.calculateInsetArea(br, b.getMargin(), vr); + SwingUtilities.calculateInnerArea(b, vr); String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), b.getText(), currentIcon(b), @@ -270,7 +268,7 @@ public class BasicButtonUI extends ButtonUI || b.isSelected()) paintButtonPressed(g, b); else - paintButtonNormal(g, br, c); + paintButtonNormal(g, vr, c); paintIcon(g, c, ir); if (text != null) diff --git a/javax/swing/plaf/basic/BasicGraphicsUtils.java b/javax/swing/plaf/basic/BasicGraphicsUtils.java index b1064f48e..07be39d06 100644 --- a/javax/swing/plaf/basic/BasicGraphicsUtils.java +++ b/javax/swing/plaf/basic/BasicGraphicsUtils.java @@ -595,7 +595,6 @@ public class BasicGraphicsUtils Rectangle iconRect = new Rectangle(); Rectangle textRect = new Rectangle(); Insets insets = b.getInsets(); - Insets margin = b.getMargin(); viewRect = new Rectangle(); @@ -628,11 +627,11 @@ public class BasicGraphicsUtils contentRect = textRect.union(iconRect); - return new Dimension(insets.left + margin.left + return new Dimension(insets.left + contentRect.width - + insets.right + margin.right, - insets.top + margin.top + + insets.right, + insets.top + contentRect.height - + insets.bottom + margin.bottom); + + insets.bottom); } } diff --git a/javax/swing/plaf/metal/MetalBorders.java b/javax/swing/plaf/metal/MetalBorders.java index 2871b945b..8b7ebecf4 100644 --- a/javax/swing/plaf/metal/MetalBorders.java +++ b/javax/swing/plaf/metal/MetalBorders.java @@ -175,7 +175,6 @@ public class MetalBorders newInsets = new Insets(0, 0, 0, 0); AbstractButton b = (AbstractButton) c; - Insets margin = b.getMargin(); newInsets.bottom = borderInsets.bottom; newInsets.left = borderInsets.left; newInsets.right = borderInsets.right; |