2002/06/14 22:58:02

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

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index dd367ec..e34fe98 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;
@@ -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;
@@ -821,16 +825,16 @@ public final class Box extends JSObject {
         if (w <= 0 || h <= 0) return;
 
         if (border != null) renderBorder(x, y, w, h, buf);
-
         if ((color & 0xFF000000) != 0x00000000 || getParent() == null) {
             int bw = border == null ? 0 : border[2].getWidth();
             int bh = border == null ? 0 : border[0].getHeight();
+            int x1 = max(x, pos(0) + bw);
+            int y1 = max(y, pos(1) + bh);
+            int x2 = min(x + w, pos(0) + size(0) - bw);
+            int y2 = min(y + h, pos(1) + size(1) - bh);
             buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
-            buf.fillRect(max(x, pos(0) + bw),
-                         max(y, pos(1) + bh),
-                         min(x + w, pos(0) + size(0) - bw),
-                         min(y + h, pos(1) + size(1) - bh),
-                         (color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray);
+            if (y2 - y1 > 0 && x2 - x1 > 0)
+                buf.fillRect(x1,y1,x2,y2,(color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray);
         }
 
         if (image != null) {