mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-20 03:58:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlowLayout.java (layoutContainer): Correctly compute loop termination condition.

Browse Source 
* java/awt/FlowLayout.java (layoutContainer): Correctly compute
	loop termination condition.
	* java/awt/GridLayout.java (getSize): Use `real_cols' to compute
	width.

From-SVN: r49216
This commit is contained in:
Tom Tromey 2002-01-25 17:25:26 +00:00 committed by Tom Tromey
parent fd29f6eae8
commit 2fb4e07f24
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2002-01-25 Tom Tromey <tromey@redhat.com>
* java/awt/FlowLayout.java (layoutContainer): Correctly compute
loop termination condition.
* java/awt/GridLayout.java (getSize): Use `real_cols' to compute
width.
2002-01-24 Tom Tromey <tromey@redhat.com>
* java/awt/Shape.java: Merged with Classpath.

8
libjava/java/awt/FlowLayout.java
View File

@ -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;
}
}

4
libjava/java/awt/GridLayout.java
View File

@ -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);
}