2006-04-28 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	PR 27296
	* javax/swing/ScrollPaneLayout.java (layoutContainer):
	Decide about scroll bars from the preferred view size, not
	the current size.
	* javax/swing/ViewportLayout.java (layoutContainer):
	Do not change returned preferred size. Do not treat JScrollPane
	specially.

1 files changed, 5 insertions, 9 deletions

diff --git a/javax/swing/ViewportLayout.java b/javax/swing/ViewportLayout.java
index 67b69eb28..b61834e9e 100644
--- a/javax/swing/ViewportLayout.java
+++ b/javax/swing/ViewportLayout.java
@@ -158,7 +158,7 @@ public class ViewportLayout implements LayoutManager, Serializable
     // the viewport require inputs in view space.
 
     Rectangle portBounds = port.getViewRect();
-    Dimension viewPref = view.getPreferredSize();
+    Dimension viewPref = new Dimension(view.getPreferredSize());
 
     Point portLowerRight = new Point(portBounds.x + portBounds.width,
                                      portBounds.y + portBounds.height);
@@ -182,14 +182,10 @@ public class ViewportLayout implements LayoutManager, Serializable
           }
       }
 
-    // The scroll pane manages the view size itself.
-    if (! (port.getParent() instanceof JScrollPane) )
-      {
-        if (viewPref.width < portBounds.width)
-          viewPref.width = portBounds.width;
-        if (viewPref.height < portBounds.height)
-          viewPref.height = portBounds.height;
-      }
+     if (viewPref.width < portBounds.width)
+       viewPref.width = portBounds.width;
+     if (viewPref.height < portBounds.height)
+       viewPref.height = portBounds.height;
 
     // If the view is larger than the port, the port is top and right
     // aligned.