diff options
Diffstat (limited to 'libjava/javax/swing/plaf/basic/BasicSliderUI.java')
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicSliderUI.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/javax/swing/plaf/basic/BasicSliderUI.java index 7334b2e0eb3..b5c95cb68c3 100644 --- a/libjava/javax/swing/plaf/basic/BasicSliderUI.java +++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.java @@ -1226,6 +1226,7 @@ public class BasicSliderUI extends SliderUI if (slider.getLabelTable() == null) return 0; + Dimension pref; for (Enumeration list = slider.getLabelTable().elements(); list.hasMoreElements();) { @@ -1233,8 +1234,9 @@ public class BasicSliderUI extends SliderUI if (! (comp instanceof Component)) continue; label = (Component) comp; - if (label.getWidth() > widest) - widest = label.getWidth(); + pref = label.getPreferredSize(); + if (pref != null && pref.width > widest) + widest = pref.width; } return widest; } @@ -1252,7 +1254,7 @@ public class BasicSliderUI extends SliderUI if (slider.getLabelTable() == null) return 0; - + Dimension pref; for (Enumeration list = slider.getLabelTable().elements(); list.hasMoreElements();) { @@ -1260,8 +1262,9 @@ public class BasicSliderUI extends SliderUI if (! (comp instanceof Component)) continue; label = (Component) comp; - if (label.getHeight() > tallest) - tallest = label.getHeight(); + pref = label.getPreferredSize(); + if (pref != null && pref.height > tallest) + tallest = pref.height; } return tallest; } |
