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:
c4b599c
)
respun fix for 538 to work with adam's latest patches
author
tupshin
<tupshin@tupshin.com>
Sun, 11 Apr 2004 21:55:18 +0000
(21:55 +0000)
committer
tupshin
<tupshin@tupshin.com>
Sun, 11 Apr 2004 21:55:18 +0000
(21:55 +0000)
darcs-hash:
20040411215518
-a9258-
646ffe22fe94d6c1d1a82521f62db971919798c0
.gz
src/org/ibex/Box.java
patch
|
blob
|
history
diff --git
a/src/org/ibex/Box.java
b/src/org/ibex/Box.java
index
c153c8b
..
1f0da15
100644
(file)
--- a/
src/org/ibex/Box.java
+++ b/
src/org/ibex/Box.java
@@
-171,8
+171,8
@@
public final class Box extends JSScope implements Scheduler.Task {
public void perform() throws JSExn {
if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
if (texture.isLoaded) {
public void perform() throws JSExn {
if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
if (texture.isLoaded) {
- setMinWidth(max(texture.width, maxwidth));
- setMinHeight(max(texture.height, maxheight));
+ setMinWidth(max(texture.width, minwidth));
+ setMinHeight(max(texture.height, minheight));
DIRTY; }
else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
}
DIRTY; }
else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
}