From d808d820e5497c26db571413862b4e39dbf9bf8c Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:47:15 +0000 Subject: [PATCH] 2002/05/16 04:17:38 darcs-hash:20040130064715-2ba56-4f9cc9455a0f7d220f2f8a0a83fff169fa1c01ed.gz --- CHANGES | 4 ++++ src/org/xwt/Box.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 71f85da..d56467a 100644 --- a/CHANGES +++ b/CHANGES @@ -140,3 +140,7 @@ 15-May megacz JSObject.java: added extra logic to discriminate between public and private puts. +15-May megacz Box.java: added setLimits() call, refined cmin-updating + logic, added extra logging in the event of a + PosChange/SizeChange infinite loop. + diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index dd367ec..ff243cc 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -289,6 +289,9 @@ public final class Box extends JSObject { if (getParent() == null && surface != null && which == size) surface._setSize(axis == 0 ? newvalue : size(0), axis == 1 ? newvalue : size(1)); + if (getParent() == null && surface != null && (which == dmin || which == dmax)) + surface.setLimits(dmin(0), dmin(1), dmax(0), dmax(1)); + switch(which) { case dmin: if (dmin(axis) == newvalue) return; if (axis == 0) _dmin_0 = newvalue; else _dmin_1 = newvalue; break; case dmax: if (dmax(axis) == newvalue) return; if (axis == 0) _dmax_0 = newvalue; else _dmax_1 = newvalue; break; @@ -326,7 +329,7 @@ public final class Box extends JSObject { if (which == pad) sync_cmin_to_children(); // needed in the shrink case, since dmin may have been the deciding factor in calculating cmin - if ((vshrink || hshrink) && which == dmin) sync_cmin_to_children(); + if ((vshrink || hshrink) && (which == dmin || which == textdim || which == pad)) sync_cmin_to_children(); // if the cmin changes, we need to be re-prerendered if (which == cmin) mark_for_prerender(); @@ -693,6 +696,7 @@ public final class Box extends JSObject { if (sizechange || poschange) if (surface.sizePosChangesSinceLastRender++ > 500) { if (Log.on) Log.log(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); + if (Log.on) Log.log(this, " interpreter is at " + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); InterpretedFunction f = (InterpretedFunction)t.f; -- 1.7.10.4