From 10de970cc8f3f66ca052218c452cde503e77ea49 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:50:36 +0000 Subject: [PATCH] 2002/10/03 23:35:33 darcs-hash:20040130065036-2ba56-c87c53ece8a833e59b5dd9ca1004faa13c26e32b.gz --- src/org/xwt/Box.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 7dd88a5..4cefc9e 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -798,7 +798,7 @@ public final class Box extends JSObject { for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { if (bt.absolute || bt.invisible) continue; - int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); + int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, btmax)); total += bt.size(o); @@ -827,7 +827,7 @@ public final class Box extends JSObject { while(goal != total && total != last) { last = total; for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { - int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); + int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), btmax); total += newsize - bt.size(o); bt.set(size, o, newsize); -- 1.7.10.4