diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/awt/FlowLayout.java | 8 | ||||
| -rw-r--r-- | libjava/java/awt/GridLayout.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java index 90c178a..a432a51 100644 --- a/libjava/java/awt/FlowLayout.java +++ b/libjava/java/awt/FlowLayout.java @@ -207,12 +207,12 @@ public class FlowLayout implements LayoutManager, Serializable else x = d.width - new_w; - for (int k = i; i < j; ++k) + for (int k = i; k < j; ++k) { - if (comps[i].visible) + if (comps[k].visible) { - Dimension c = comps[i].getPreferredSize (); - comps[i].setLocation (x, y); + Dimension c = comps[k].getPreferredSize (); + comps[k].setLocation (x, y); x += c.width + vgap; } } diff --git a/libjava/java/awt/GridLayout.java b/libjava/java/awt/GridLayout.java index d887f3e..e6cf1ec 100644 --- a/libjava/java/awt/GridLayout.java +++ b/libjava/java/awt/GridLayout.java @@ -320,8 +320,8 @@ public class GridLayout implements LayoutManager, Serializable Insets ins = parent.getInsets (); // We subtract out an extra gap here because the gaps are only // between cells. - w = ins.left + ins.right + real_rows * (w + hgap) - hgap; - h = ins.top + ins.bottom + real_cols * (h + vgap) - vgap; + w = ins.left + ins.right + real_cols * (w + hgap) - hgap; + h = ins.top + ins.bottom + real_rows * (h + vgap) - vgap; return new Dimension (w, h); } |