projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e7dd66
)
fixed bug 500
author
adam
<adam@megacz.com>
Mon, 5 Apr 2004 20:21:15 +0000
(20:21 +0000)
committer
adam
<adam@megacz.com>
Mon, 5 Apr 2004 20:21:15 +0000
(20:21 +0000)
darcs-hash:
20040405202115
-5007d-
67e9806fe555d7c13781830207d3114a81c51271
.gz
src/org/ibex/Box.java
patch
|
blob
|
history
diff --git
a/src/org/ibex/Box.java
b/src/org/ibex/Box.java
index
f889d6e
..
e77935d
100644
(file)
--- a/
src/org/ibex/Box.java
+++ b/
src/org/ibex/Box.java
@@
-294,8
+294,8
@@
public final class Box extends JSScope implements Scheduler.Task {
}
private static float[] coeff = null;
}
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++;
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);
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());
}
} else {
throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass());
}