diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-01-29 16:30:25 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2002-01-29 16:30:25 +0000 |
| commit | ce0a2210a4be582657c5adfbeb69176ef0c48786 (patch) | |
| tree | 2d12c79e1fcac38e09efe8574bcdc51323f99637 | |
| parent | 2617ff79ec910c36ee6725b991234c6bfe64367a (diff) | |
| download | classpath-ce0a2210a4be582657c5adfbeb69176ef0c48786.tar.gz | |
* java/awt/GridLayout.java (layoutContainer): Use number of rows
to compute height of each cell, and number of columns to compute
width of each cell.
* java/awt/Window.java (getOwnedWindows): Don't return null.
* java/awt/FlowLayout.java (layoutContainer): Set width and height
of component. Increment x using horizontal gap, not vertical
gap.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | java/awt/FlowLayout.java | 4 | ||||
| -rw-r--r-- | java/awt/GridLayout.java | 4 | ||||
| -rw-r--r-- | java/awt/Window.java | 2 |
4 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,13 @@ +2002-01-29 Tom Tromey <tromey@redhat.com> + + * java/awt/GridLayout.java (layoutContainer): Use number of rows + to compute height of each cell, and number of columns to compute + width of each cell. + * java/awt/Window.java (getOwnedWindows): Don't return null. + * java/awt/FlowLayout.java (layoutContainer): Set width and height + of component. Increment x using horizontal gap, not vertical + gap. + 2002-01-25 Tom Tromey <tromey@redhat.com> * java/awt/FlowLayout.java (layoutContainer): Correctly compute diff --git a/java/awt/FlowLayout.java b/java/awt/FlowLayout.java index a432a51a5..e328d6379 100644 --- a/java/awt/FlowLayout.java +++ b/java/awt/FlowLayout.java @@ -212,8 +212,8 @@ public class FlowLayout implements LayoutManager, Serializable if (comps[k].visible) { Dimension c = comps[k].getPreferredSize (); - comps[k].setLocation (x, y); - x += c.width + vgap; + comps[k].setBounds (x, y, c.width, new_h); + x += c.width + hgap; } } diff --git a/java/awt/GridLayout.java b/java/awt/GridLayout.java index e6cf1ec19..347186536 100644 --- a/java/awt/GridLayout.java +++ b/java/awt/GridLayout.java @@ -172,9 +172,9 @@ public class GridLayout implements LayoutManager, Serializable // Compute width and height of each cell in the grid. int tw = d.width - ins.left - ins.right; - tw = (tw - (real_rows - 1) * hgap) / real_rows; + tw = (tw - (real_cols - 1) * hgap) / real_cols; int th = d.height - ins.top - ins.bottom; - th = (th - (real_cols - 1) * vgap) / real_cols; + th = (th - (real_rows - 1) * vgap) / real_rows; // If the cells are too small, still try to do something. if (tw < 0) diff --git a/java/awt/Window.java b/java/awt/Window.java index b95dc8e96..6af7c3450 100644 --- a/java/awt/Window.java +++ b/java/awt/Window.java @@ -303,7 +303,7 @@ public class Window extends Container { // FIXME: return array containing all the windows this window currently // owns. - return null; + return new Window[0]; } /** |