2006-01-10 Roman Kennke <kennke@aicas.com>

	* javax/swing/ViewportLayout.java
	(layoutContainer): Fixed condition, so that Scrollable components
	are always forced to have to Viewport size, when they
	return true for getScrollableTracksViewportHeight() and ..Width().

1 files changed, 4 insertions, 6 deletions

diff --git a/javax/swing/ViewportLayout.java b/javax/swing/ViewportLayout.java
index 54935a89f..3b473b072 100644
--- a/javax/swing/ViewportLayout.java
+++ b/javax/swing/ViewportLayout.java
@@ -145,9 +145,8 @@ public class ViewportLayout implements LayoutManager, Serializable
                                      portBounds.y + portBounds.height);
 
     // vertical implementation of the above rules
-    if ((! (view instanceof Scrollable)
-         || ((Scrollable) view).getScrollableTracksViewportHeight())
-        && viewPref.height < portBounds.height)
+    if ((! (view instanceof Scrollable) && viewPref.height < portBounds.height
+         || ((Scrollable) view).getScrollableTracksViewportHeight()))
       viewPref.height = portBounds.height;
 
     if (portBounds.height >= viewMinimum.height)
@@ -160,9 +159,8 @@ public class ViewportLayout implements LayoutManager, Serializable
       }
 
     // horizontal implementation of the above rules
-    if ((! (view instanceof Scrollable)
-         || ((Scrollable) view).getScrollableTracksViewportWidth())
-        && viewPref.width < portBounds.width)
+    if ((! (view instanceof Scrollable) && viewPref.width < portBounds.width
+         || ((Scrollable) view).getScrollableTracksViewportWidth()))
       viewPref.width = portBounds.width;
 
     if (portBounds.width >= viewMinimum.width)