From 6fc4c718ab07523a965607c815e66192a49623eb Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Tue, 24 Sep 2002 07:56:25 +0000 Subject: [PATCH] Properly return an explicitly-specified preferred size in getPreferredSize(). git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1750 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/miso/client/SceneViewPanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/miso/client/SceneViewPanel.java b/src/java/com/threerings/miso/client/SceneViewPanel.java index 864bb6f75..91ef63827 100644 --- a/src/java/com/threerings/miso/client/SceneViewPanel.java +++ b/src/java/com/threerings/miso/client/SceneViewPanel.java @@ -1,5 +1,5 @@ // -// $Id: SceneViewPanel.java,v 1.43 2002/06/21 00:04:41 mdb Exp $ +// $Id: SceneViewPanel.java,v 1.44 2002/09/24 07:56:25 shaper Exp $ package com.threerings.miso.scene; @@ -178,8 +178,8 @@ public class SceneViewPanel extends VirtualMediaPanel */ public Dimension getPreferredSize () { - return (_viewmodel == null) ? super.getPreferredSize() : - _viewmodel.bounds.getSize(); + return (_viewmodel == null || isPreferredSizeSet()) ? + super.getPreferredSize() : _viewmodel.bounds.getSize(); } // documentation inherited