fixed bug 522

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

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index f889d6e..bc77085 100644 (file)
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -245,7 +245,7 @@ public final class Box extends JSScope implements Scheduler.Task {
 
     void constrain() {
         //#repeat contentwidth/contentheight colspan/rowspan col/row cols/rows minwidth/minheight \
-        //        textwidth/textheight maxwidth/maxheight cols/rows
+        //        textwidth/textheight maxwidth/maxheight cols/rows rowspan/colspan row/col rows/cols
         // FIXME: inefficient
         contentwidth = 0;
         for(int i=0; i<rows; i++) {
@@ -294,8 +294,8 @@ 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);
+    private static LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex(100, 100, 300);
+    private static LinearProgramming.Simplex lp_v = new LinearProgramming.Simplex(100, 100, 300);
 
     void place_children() {
         int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
@@ -732,6 +732,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 && texture.isLoaded) perform();
         } else {
             throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass());
         }