OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GridLayout.java (layoutContainer): Use number of rows to compute height of each cell... 

* 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.

From-SVN: r49320
This commit is contained in:
Tom Tromey 2002-01-29 16:31:24 +00:00 committed by Tom Tromey
parent d09f7cb26b
commit 6c54b16cef
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -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-28 Tom Tromey <tromey@redhat.com>
* verify.cc (class _Jv_BytecodeVerifier) [op_invokeinterface]:

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

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

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

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

2
libjava/java/awt/Window.java
View File

@ -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];
}
/**