X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=514d301a0fcbbe083566c2e5d983da51eefe152d;hb=7bfa509c88f79ec899e7e6ebdb775d3c83e420f9;hp=f8b4bf5639a06904e19cf2b9b8c0dc474f30d45c;hpb=9c46568249885085b710f76f00a56a12f5ee61c9;p=org.ibex.core.git

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index f8b4bf5..514d301 100644
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -177,7 +177,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         // as external events have occured, check the state of box
         if (texture != null) {
             if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); }
-            else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res); }
+            else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
         } else {
             Log.warn(Box.class, "perform() called with null texture");
         }
@@ -215,12 +215,10 @@ public final class Box extends JSScope implements Scheduler.Task {
     // static stuff so we don't have to keep reallocating
     private static int[] numRowsInCol = new int[65535];
     private static LENGTH[] colWidth = new LENGTH[65535];
-    private static LENGTH[] colMinWidth = new LENGTH[65535];
     private static LENGTH[] colMaxWidth = new LENGTH[65535];
     private static LENGTH[] rowHeight = new LENGTH[65535];
-    private static LENGTH[] rowMinHeight = new LENGTH[65535];
     private static LENGTH[] rowMaxHeight = new LENGTH[65535];
-    static { for(int i=0; i<rowMaxHeight.length; i++) { rowMaxHeight[i] = MAX_LENGTH; colMaxWidth[i] = MAX_LENGTH; } }
+    static { for(int i=0; i<rowMaxHeight.length; i++) { rowMaxHeight[i] = 0; colMaxWidth[i] = 0; } }
 
     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(); }
@@ -248,14 +246,12 @@ public final class Box extends JSScope implements Scheduler.Task {
         }
         //#end
 
-        //#repeat contentwidth/contentheight colMinWidth/rowMinHeight colspan/rowspan col/row cols/rows minwidth/minheight \
-        //        textwidth/textheight maxwidth/maxheight colWidth/rowHeight
+        //#repeat contentwidth/contentheight colWidth/rowHeight colspan/rowspan col/row cols/rows minwidth/minheight \
+        //        textwidth/textheight maxwidth/maxheight
         contentwidth = 0;
-        for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling()) {
-            colMinWidth[child.col] = max(colMinWidth[child.col], child.contentwidth / child.colspan);
-            colWidth[child.col] = 0;
-        }
-        for(int i=0; i<cols; i++) { contentwidth += colMinWidth[i]; colMinWidth[i] = 0; }
+        for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling())
+            colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
+        for(int i=0; i<cols; i++) { contentwidth += colWidth[i]; colWidth[i] = 0; }
         contentwidth = bound(minwidth, max(font == null || text == null ? 0 : font.textwidth(text), contentwidth), maxwidth);
         //#end               
     }
@@ -296,41 +292,35 @@ public final class Box extends JSScope implements Scheduler.Task {
 
     void resize_children() {
 
-        int eligible;
         //#repeat col/row colspan/rowspan contentwidth/contentheight x/y width/height colMaxWidth/rowMaxHeight colWidth/rowHeight \
-        //        colMinWidth/rowMinHeight HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight \
-        //        x_slack/y_slack
+        //        HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight x_slack/y_slack
         // PHASE 1: compute column min/max sizes
-        int x_slack = width;
-        eligible = 0;
-        for(int i=0; i<cols; i++) x_slack -= colWidth[i];
         for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling())
             for(int i=child.col; i < child.col + child.colspan; i++) {
-                colMinWidth[i] = max(colWidth[i], child.contentwidth / child.colspan);
-                colMaxWidth[i] = min(colMaxWidth[i], child.test(HSHRINK) ? child.contentwidth : child.maxwidth) / child.colspan;
-                colWidth[i] = 0;
-                eligible++;
+                colWidth[i] = max(colWidth[i], child.contentwidth / child.colspan);
+                colMaxWidth[i] = max(colMaxWidth[i], (child.test(HSHRINK) ? child.contentwidth : child.maxwidth) / child.colspan);
             }
         
         // PHASE 2: hand out slack
-        for(int startslack = 0; x_slack > 0 && cols > 0 && startslack != x_slack;) {
-            if (eligible == 0) break;
-            int increment = x_slack / eligible;
+        int x_slack = width;
+        for(int i=0; i<cols; i++) x_slack -= colWidth[i]; 
+        // loop through until there are no more eligible children or all slack is handed out
+        for(int eligible = cols, slacklevel = 0; x_slack > 0 && eligible > 0;) {
+            int increment = max(1, x_slack / eligible);
             eligible = 0;
-            startslack = x_slack;
-            for(short col=0; col < cols; col++) {
-                // FIXME: double check this
-                int diff = min(min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col], x_slack);
-                if (colWidth[col] + diff < colMinWidth[col]) diff = colMinWidth[col] - colWidth[col];
-                if (diff == 0) continue;
+            for(short col=0, count=0; col < cols; col++) {
+                if (colMaxWidth[col] <= colWidth[col]) continue;
+                if (slacklevel + increment < colWidth[col]) { eligible++; continue; }
+                int diff = min(increment, min(colMaxWidth[col] - colWidth[col], slacklevel + increment - colWidth[col]));
                 eligible++;
-                x_slack -= diff;
                 colWidth[col] += diff;
+                x_slack -= diff;
             }
-        }   
+            slacklevel += increment;
+        }
         //#end
 
-        // Phase 3: assign childrens' actual sizes
+        // PHASE 3: assign childrens' actual sizes
         for(Box child = getChild(0); child != null; child = child.nextSibling()) {
             if (!child.test(VISIBLE)) continue;
             int child_width, child_height, child_x, child_y;
@@ -360,8 +350,8 @@ public final class Box extends JSScope implements Scheduler.Task {
         }
 
         // cleanup
-        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(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(Box child = getChild(0); child != null; child = child.nextSibling())
             if (test(VISIBLE))
@@ -697,7 +687,6 @@ 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());
         }