From 72c63304f8e478a2340ff20690a6f0ffcce22a15 Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 4 Apr 2008 00:39:10 +0000 Subject: [PATCH] If someone call's setPreferredSize(), we should use that size. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2289 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/swing/MultiLineLabel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/java/com/samskivert/swing/MultiLineLabel.java b/src/java/com/samskivert/swing/MultiLineLabel.java index e048b131..454de16e 100644 --- a/src/java/com/samskivert/swing/MultiLineLabel.java +++ b/src/java/com/samskivert/swing/MultiLineLabel.java @@ -348,6 +348,10 @@ public class MultiLineLabel extends JComponent // documentation inherited public Dimension getPreferredSize () { + if (isPreferredSizeSet()) { + return super.getPreferredSize(); + } + if (_dirty) { // attempt to lay out the label before obtaining its preferred // dimensions