yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2005-04-18 Roman Kennke <roman@kennke.org>

Browse Source 
* java/awt/BorderLayout.java
	(calcSize): Check for overflow when component sizes are added.

From-SVN: r98347
This commit is contained in:
Roman Kennke
2005-04-18 20:47:01 +00:00
committed by Michael Koch
parent f5373caf4e
commit 3556836fc7
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/awt/BorderLayout.java
+11 -1
View File
@@ -700,6 +700,10 @@ calcSize(Container target, int what)
Dimension cdim = calcCompSize(center, what);
int width = edim.width + cdim.width + wdim.width + (hgap * 2);
// check for overflow
if (width < edim.width || width < cdim.width || width < cdim.width)
width = Integer.MAX_VALUE;
if (ndim.width > width)
width = ndim.width;
if (sdim.width > width)
@@ -713,7 +717,13 @@ calcSize(Container target, int what)
if (wdim.height > height)
height = wdim.height;
height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom);
int addedHeight = height + (ndim.height + sdim.height + (vgap * 2)
+ ins.top + ins.bottom);
// check for overflow
if (addedHeight < height)
height = Integer.MAX_VALUE;
else
height = addedHeight;
return(new Dimension(width, height));
}