2002/05/16 04:00:52

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

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index f3c92d6..dd367ec 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -325,6 +325,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) sync_cmin_to_children();
+
         // if the cmin changes, we need to be re-prerendered
         if (which == cmin) mark_for_prerender(); 
 
@@ -549,7 +552,7 @@ public final class Box extends JSObject {
     }
 
     /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */
-    final void dirty(int x, int y, int w, int h) {
+    public final void dirty(int x, int y, int w, int h) {
         for(Box cur = this; cur != null; cur = cur.getParent()) {
             w = min(x + w, cur.pos(0) + cur.size(0)) - max(x, cur.pos(0));
             h = min(y + h, cur.pos(1) + cur.size(1)) - max(y, cur.pos(1));
@@ -855,7 +858,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 +1004,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) {