diff options
Diffstat (limited to 'libjava/classpath/java/awt/GridBagLayout.java')
| -rw-r--r-- | libjava/classpath/java/awt/GridBagLayout.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libjava/classpath/java/awt/GridBagLayout.java b/libjava/classpath/java/awt/GridBagLayout.java index 767610c5693..7f9ab249b6d 100644 --- a/libjava/classpath/java/awt/GridBagLayout.java +++ b/libjava/classpath/java/awt/GridBagLayout.java @@ -192,16 +192,12 @@ public class GridBagLayout if (clone.gridwidth == 0) clone.gridwidth = GridBagConstraints.REMAINDER; - else if (clone.gridwidth < 0 - && clone.gridwidth != GridBagConstraints.REMAINDER - && clone.gridwidth != GridBagConstraints.RELATIVE) + else if (clone.gridwidth < 0) clone.gridwidth = 1; if (clone.gridheight == 0) clone.gridheight = GridBagConstraints.REMAINDER; - else if (clone.gridheight < 0 - && clone.gridheight != GridBagConstraints.REMAINDER - && clone.gridheight != GridBagConstraints.RELATIVE) + else if (clone.gridheight < 0) clone.gridheight = 1; comptable.put (component, clone); @@ -913,7 +909,7 @@ public class GridBagLayout sizes[start] = Math.max(sizes[start], size); weights[start] = Math.max(weights[start], weight); } - else + else if (span > 1) { int numOccupied = span; int lastOccupied = -1; |
