2002/05/28 17:50:57

[org.ibex.core.git] / src / org / xwt / Box.java

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 7456b6e..ff243cc 100644 (file)
--- 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;
@@ -325,6 +328,9 @@ public final class Box extends JSObject {
         // if the pad changes, update cmin
         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 || which == textdim || which == pad)) sync_cmin_to_children();
+
         // if the cmin changes, we need to be re-prerendered
         if (which == cmin) mark_for_prerender(); 
 
@@ -690,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;
@@ -855,7 +862,7 @@ public final class Box extends JSObject {
         if ((color & 0xFF000000) != 0xFF000000) {
 
             // if the color is null, we have to be very careful about drawing the corners
-            if (Log.verbose) Log.log(this, "WARNING: (color == null && border != null) on box with border " + imageToNameMap.get(border[4]));
+            //if (Log.verbose) Log.log(this, "WARNING: (color == null && border != null) on box with border " + imageToNameMap.get(border[4]));
 
             // upper left corner
             buf.drawPicture(border[4],
@@ -1001,7 +1008,7 @@ public final class Box extends JSObject {
      */
     public void put(int i, Scriptable start, Object value) {
         if (value == null) {
-            if (i > 0 && i < numChildren()) getChild(i).remove();
+            if (i >= 0 && i < numChildren()) getChild(i).remove();
             return;
         }
         if (value instanceof RootProxy) {