X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=524cb7c214827daee9dec7e38c62511ff13e6c4d;hb=ea80b06d1e0e190d3748df9796c1acbb4a38aea9;hp=180a65221be3dfa743d970c3c95c566518dcf70a;hpb=1f1bf81e022398831354365d6522e92079556530;p=org.ibex.core.git

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index 180a652..524cb7c 100644
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -218,7 +218,7 @@ public final class Box extends JSScope implements Scheduler.Task {
     private static LENGTH[] colMaxWidth = new LENGTH[65535];
     private static LENGTH[] rowHeight = new LENGTH[65535];
     private static LENGTH[] rowMaxHeight = new LENGTH[65535];
-    static { for(int i=0; i<rowMaxHeight.length; i++) { rowMaxHeight[i] = 0; colMaxWidth[i] = 0; } }
+    static { for(int i=0; i<rowMaxHeight.length; i++) { rowMaxHeight[i] = MAX_LENGTH; colMaxWidth[i] = MAX_LENGTH; } }
 
     Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
     Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
@@ -302,7 +302,7 @@ public final class Box extends JSScope implements Scheduler.Task {
                 x_slack += colWidth[i];
                 colWidth[i] = max(colWidth[i], child.contentwidth / child.colspan);
                 x_slack -= colWidth[i];
-                colMaxWidth[i] = max(colMaxWidth[i], (child.test(HSHRINK) ? child.contentwidth : child.maxwidth) / child.colspan);
+                colMaxWidth[i] = min(colMaxWidth[i], child.test(HSHRINK) ? child.contentwidth : child.maxwidth) / child.colspan;
             }
         
         // PHASE 2: hand out slack
@@ -348,8 +348,8 @@ public final class Box extends JSScope implements Scheduler.Task {
         }
 
         // cleanup
-        for(int i=0; i<cols; i++) { colWidth[i] = 0; colMaxWidth[i] = 0; }
-        for(int i=0; i<rows; i++) { rowHeight[i] = 0; rowMaxHeight[i] = 0; }
+        for(int i=0; i<cols; i++) { colWidth[i] = 0; colMaxWidth[i] = MAX_LENGTH; }
+        for(int i=0; i<rows; i++) { rowHeight[i] = 0; rowMaxHeight[i] = MAX_LENGTH; }
 
         for(Box child = getChild(0); child != null; child = child.nextSibling())
             if (test(VISIBLE))
@@ -685,6 +685,7 @@ public final class Box extends JSScope implements Scheduler.Task {
             fillcolor = newfillcolor;
         } else if(value instanceof JS) {
             texture = Picture.load((JS)value, this);
+            if (texture != null) perform();
         } else {
             throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass());
         }