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:
3d545db
)
2003/11/26 02:14:07
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:42:05 +0000
(07:42 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:42:05 +0000
(07:42 +0000)
darcs-hash:
20040130074205
-2ba56-
5fc6328ca5080cb568fec30cce67a2447eeafd3c
.gz
src/org/xwt/Box.java
patch
|
blob
|
history
diff --git
a/src/org/xwt/Box.java
b/src/org/xwt/Box.java
index
c195b48
..
280924c
100644
(file)
--- a/
src/org/xwt/Box.java
+++ b/
src/org/xwt/Box.java
@@
-205,7
+205,7
@@
public final class Box extends JSScope {
short r = 0;
for(Box child = firstPackedChild(); child != null; r++) {
for(short c=0, numclear=0; child != null && c < cols; c++) {
short r = 0;
for(Box child = firstPackedChild(); child != null; r++) {
for(short c=0, numclear=0; child != null && c < cols; c++) {
- if (numRowsInCol[c] > r) continue;
+ if (numRowsInCol[c] > r) { numclear = 0; continue; }
if (c != 0 && c + min(cols, child.colspan) - numclear > cols) break;
if (++numclear < min(cols, child.colspan)) continue;
for(int i=c - numclear + 1; i <= c; i++) numRowsInCol[i] += child.rowspan;
if (c != 0 && c + min(cols, child.colspan) - numclear > cols) break;
if (++numclear < min(cols, child.colspan)) continue;
for(int i=c - numclear + 1; i <= c; i++) numRowsInCol[i] += child.rowspan;