aboutsummaryrefslogtreecommitdiff
path: root/libjava/javax/swing/plaf/basic/BasicButtonUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/javax/swing/plaf/basic/BasicButtonUI.java')
-rw-r--r--libjava/javax/swing/plaf/basic/BasicButtonUI.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java
index ed352e7..15b715b 100644
--- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/libjava/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)