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 acb4cac..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],
@@ -969,15 +972,15 @@ public final class Box extends JSObject {
 
         if (font.lastIndexOf('d') > i) {
             for(int j = pos(0) + pad(0); j < pos(0) + pad(0) + textdim(0); j += 2)
-                buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3,
-                             j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1,
+                buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
+                             j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
                              textcolor);
 
         } else if (font.lastIndexOf('u') > i) {
             buf.fillRect(pos(0) + pad(0),
-                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3,
+                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
                         pos(0) + pad(0) + textdim(0),
-                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1,
+                        pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
                         textcolor);
         }
 
@@ -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) {
@@ -1079,6 +1082,7 @@ public final class Box extends JSObject {
         if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null);
         if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null);
         if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null);
+        if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null);
 
         // See if we're reading back the function value of a trap
         if (name.charAt(0) == '_') {
@@ -1105,7 +1109,8 @@ public final class Box extends JSObject {
         if (traps != null && traps.get(name) != null) return true;
         if (name.charAt(0) == '_') return true;
         if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true;
-        if (name.equals("Function") || name.equals("Array") || name.equals("Object") || name.equals("TypeError")) return true;
+        if (name.equals("Function") || name.equals("Array") || name.equals("Object") ||
+            name.equals("TypeError") || name.equals("ConversionError")) return true;
         return super.has(name, start);
     }