X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=2ada11fffc1d619f9040748ceba98d1f300e1712;hp=9489a8b3f29d6907b1287d48be04c426e900340a;hb=ae0cd6164facf843cc136f52e3f78e3843191d61;hpb=a113d1f48d1c3db8aa08c550a925360d1d664b47

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index 9489a8b..2ada11f 100644
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -240,14 +240,21 @@ public final class Box extends JSScope implements Scheduler.Task {
             for(int i=0; i<cols; i++) numRowsInCol[i] = 0;
         }
         //#end
+        constrain();
+    }
 
-        //#repeat contentwidth/contentheight colWidth/rowHeight colspan/rowspan col/row cols/rows minwidth/minheight \
+    void constrain() {
+        //#repeat contentwidth/contentheight colspan/rowspan col/row cols/rows minwidth/minheight \
         //        textwidth/textheight maxwidth/maxheight cols/rows
+        // FIXME: inefficient
         contentwidth = 0;
-        int[] colWidth = new int[cols];
-        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];
+        for(int i=0; i<rows; i++) {
+            int rowcontentwidth = 0;
+            for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling())
+                if (child.row <= i && (child.row + child.rowspan > i))
+                    rowcontentwidth += child.contentwidth;
+            contentwidth = max(contentwidth, rowcontentwidth);
+        }
         contentwidth = bound(minwidth, max(font == null || text == null ? 0 : font.textwidth(text), contentwidth), maxwidth);
         //#end               
     }
@@ -287,57 +294,56 @@ public final class Box extends JSScope implements Scheduler.Task {
     }
 
     private static float[] coeff = null;
+    private static LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex(50, 50, 300);
+    private static LinearProgramming.Simplex lp_v = new LinearProgramming.Simplex(50, 50, 300);
+
     void place_children() {
         int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
-        int nc = numkids * 2 + cols * 3 + 1 + 2;
-        if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
-        LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex();
-        LinearProgramming.Problem lpr_h = new LinearProgramming.Problem(nc, nc);
-        LinearProgramming.Simplex lp_v = new LinearProgramming.Simplex();
-        LinearProgramming.Problem lpr_v = new LinearProgramming.Problem(nc, nc);
-
-        //#repeat col/row colspan/rowspan contentwidth/contentheight width/height colMaxWidth/rowMaxHeight colWidth/rowHeight \
-        //        HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight x_slack/y_slack lp_h/lp_v lpr_h/lpr_v
+        //#repeat col/row colspan/rowspan contentwidth/contentheight width/height \
+        //        maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp_v lp_h/lp_v
         do {
+            int nc = numkids * 2 + cols * 3 + 1 + 2;
+            if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
+            lp_h.init(nc, nc);
+
             // objective function
-            coeff[cols*2+numkids] = coeff[cols*2+numkids+1] = (float)-10000.0;    // attempt to make sum of columns equal to parent width
-            for(int i=cols*2; i<cols*2+numkids; i++) coeff[i] = (float)100.0;     // second priority: try to honor maxwidths
-            for(int i=cols; i<cols*2; i++) coeff[i] = (float)(-1.0);              // third priority: try to make all columns similar size
-            lp_h.set_obj_fn(lpr_h, coeff);
-            lp_h.set_maxim(lpr_h);
+            for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
+            coeff[cols*2+numkids] = (float)-100000.0;                             // priority 1: sum of columns equals parent
+            for(int i=cols*2; i<cols*2+numkids; i++) coeff[i] = (float)-1000.0;   // priority 2: honor maxwidths
+            for(int i=cols; i<cols*2; i++) coeff[i] = (float)(-1.0);              // priority 3: equalize columns
+            lp_h.setObjective(coeff, true);
 
-            // top priority: try to match the parent's width
+            // priority 1: sum of columns at least as big as parent
             for(int i=0; i<coeff.length; i++) coeff[i] = (i<cols) ? (float)1.0 : (float)0.0;
-            coeff[cols*2+numkids] = (float)-1.0;
-            lp_h.add_constraint(lpr_h, coeff, LinearProgramming.LE, (float)width);
-
+            lp_h.add_constraint(coeff, LinearProgramming.GE, (float)width);
             for(int i=0; i<coeff.length; i++) coeff[i] = (i<cols) ? (float)1.0 : (float)0.0;
-            coeff[cols*2+numkids+1] = (float)1.0;
-            lp_h.add_constraint(lpr_h, coeff, LinearProgramming.GE, (float)width);
+            coeff[cols*2+numkids] = (float)1.0;
+            lp_h.add_constraint(coeff, LinearProgramming.EQ, (float)width);
 
-            // obey minwidth, second priority: try to obey maxwidth (if relevant)
+            // priority 2: honor maxwidths
             int childnum = 0;
             for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling()) {
-                for(int i=0; i<coeff.length; i++) coeff[i] = (i>=child.col && i<min(child.colspan+child.col, cols)) ? (float)1.0 : (float)0.0;
-                lp_h.add_constraint(lpr_h, coeff, LinearProgramming.GE, (float)child.minwidth);
+                for(int i=0; i<coeff.length; i++)
+                    coeff[i] = (i>=child.col && i<min(child.colspan+child.col, cols)) ? (float)1.0 : (float)0.0;
+                lp_h.add_constraint(coeff, LinearProgramming.GE, (float)child.contentwidth);
                 if (child.maxwidth < Integer.MAX_VALUE) {
                     for(int i=0; i<coeff.length; i++)
                         coeff[i] = (i>=child.col && i<min(child.colspan+child.col, cols)) ? (float)1.0 : (float)0.0;
-                    coeff[cols*2+childnum] = (float)1.0;
-                    lp_h.add_constraint(lpr_h, coeff, LinearProgramming.EQ, (float)child.maxwidth);
+                    coeff[cols*2+childnum] = (float)-1.0;
+                    lp_h.add_constraint(coeff, LinearProgramming.EQ, (float)child.maxwidth);
                 }
                 for(int j=0; j<coeff.length; j++) coeff[j] = (float)0.0;
                 childnum++;
             }
 
-            // third priority: try to make columns similar size
+            // priority 3: equalize columns
             for(int i=0 ; i<cols; i++) {
-                lp_h.set_lowbo(lpr_h, i+1, (float)0.0);
-                lp_h.bound_difference(lpr_h, i, cols+i, ((float)width)/((float)cols), LinearProgramming.LE, coeff);
-                lp_h.bound_sum(       lpr_h, i, cols+i, ((float)width)/((float)cols), LinearProgramming.GE, coeff);
+                lp_h.set_lowbo(i+1, (float)0.0);
+                lp_h.bound_difference(i, cols+i, ((float)width)/((float)cols), LinearProgramming.LE, coeff);
+                lp_h.bound_sum(       i, cols+i, ((float)width)/((float)cols), LinearProgramming.GE, coeff);
             }
 
-            lp_h.solve(lpr_h);
+            lp_h.solve();
         } while(false);
         //#end
         
@@ -354,14 +360,16 @@ public final class Box extends JSScope implements Scheduler.Task {
                 child_x = child.ax + (child.test(ALIGN_RIGHT) ? gap_x : !child.test(ALIGN_LEFT) ? gap_x / 2 : 0);
                 child_y = child.ay + (child.test(ALIGN_BOTTOM) ? gap_y : !child.test(ALIGN_TOP) ? gap_y / 2 : 0);
             } else {
+                int diff;
                 //#repeat col/row colspan/rowspan contentwidth/contentheight width/height colMaxWidth/rowMaxHeight \
                 //        child_x/child_y x/y HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight x_slack/y_slack \
-                //        colWidth/rowHeight child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lpr_h/lpr_v
+                //        child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp_v
                 child_width = 0;
                 child_x = 0;
-                for(int i=0; i < child.col; i++) child_x += Math.round(lpr_h.solution[lpr_h.rows+i+1]);
-                for(int i = child.col; i < child.col + child.colspan; i++) child_width += Math.round(lpr_h.solution[lpr_h.rows+i+1]);
-                child_x += (child_width - min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth)) / 2;
+                for(int i=0; i < child.col; i++) child_x += Math.round(lp_h.solution[lp_h.rows+i+1]);
+                for(int i = child.col; i<child.col + child.colspan; i++) child_width += Math.round(lp_h.solution[lp_h.rows+i+1]);
+                diff = (child_width - min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth));
+                child_x += (child.test(ALIGN_RIGHT) ? diff : child.test(ALIGN_LEFT) ? 0 : diff / 2);
                 child_width = min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth);
                 //#end
             }
@@ -579,6 +587,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value);  // FEATURE
         case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true);
         case "redirect":
+            if (value == null) { redirect = null; return; }
             for(Box cur = (Box)value; cur != null; cur = cur.parent)
                 if (cur == redirect) {
                     redirect = (Box)value;