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
This commit is contained in:
Walter Korman
2002-09-24 07:56:25 +00:00
parent 64bb4715cc
commit 6fc4c718ab
@@ -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; package com.threerings.miso.scene;
@@ -178,8 +178,8 @@ public class SceneViewPanel extends VirtualMediaPanel
*/ */
public Dimension getPreferredSize () public Dimension getPreferredSize ()
{ {
return (_viewmodel == null) ? super.getPreferredSize() : return (_viewmodel == null || isPreferredSizeSet()) ?
_viewmodel.bounds.getSize(); super.getPreferredSize() : _viewmodel.bounds.getSize();
} }
// documentation inherited // documentation inherited