diff options
Diffstat (limited to 'libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java')
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java index 65cc7b9f038..1f2f7444db1 100644 --- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java +++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java @@ -597,10 +597,7 @@ public class BasicGraphicsUtils Insets insets = b.getInsets(); Insets margin = b.getMargin(); - /* For determining the ideal size, do not assume a size restriction. */ - viewRect = new Rectangle(0, 0, - /* width */ Integer.MAX_VALUE, - /* height */ Integer.MAX_VALUE); + viewRect = new Rectangle(); /* java.awt.Toolkit.getFontMetrics is deprecated. However, it * seems not obvious how to get to the correct FontMetrics object @@ -614,14 +611,13 @@ public class BasicGraphicsUtils b.getToolkit().getFontMetrics(b.getFont()), // see comment above b.getText(), b.getIcon(), - SwingUtilities.TOP, // important: - SwingUtilities.LEFT, // large vrect, stick to the top left + b.getVerticalAlignment(), + b.getHorizontalAlignment(), b.getVerticalTextPosition(), b.getHorizontalTextPosition(), viewRect, iconRect, textRect, textIconGap); - /* +------------------------+ +------------------------+ * | | | | * | ICON | | CONTENTCONTENTCONTENT | @@ -629,6 +625,7 @@ public class BasicGraphicsUtils * | TEXTTEXTTEXT | | CONTENTCONTENTCONTENT | * +------------------------+ +------------------------+ */ + contentRect = textRect.union(iconRect); return new Dimension(insets.left + margin.left |