// FIXME
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
package org.ibex;
// FEATURE: reflow before allowing js to read from width/height
// Macros //////////////////////////////////////////////////////////////////////
//#define LENGTH int
- //#define MARK_REPACK for(Box b2 = this; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK);
- //#define MARK_REPACK_b for(Box b2 = b; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK);
- //#define MARK_REPACK_parent for(Box b2 = parent; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK);
- //#define MARK_REFLOW for(Box b2 = this; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW);
- //#define MARK_REFLOW_b for(Box b2 = b; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW);
- //#define MARK_RESIZE for(Box b2 = this; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE);
- //#define MARK_RESIZE_b for(Box b2 = b; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE);
+
+ final void REPLACE() { for(Box b2 = this; b2 != null && !b2.test(REPLACE); b2 = b2.parent) b2.set(REPLACE); }
+ final void RECONSTRAIN() { for(Box b2 = this; b2 != null && !b2.test(RECONSTRAIN); b2 = b2.parent) b2.set(RECONSTRAIN); }
+ final void REPACK() { for(Box b2 = this; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); }
+
//#define CHECKSET_SHORT(prop) short nu = (short)toInt(value); if (nu == prop) break; prop = nu;
//#define CHECKSET_INT(prop) int nu = toInt(value); if (nu == prop) break; prop = nu;
//#define CHECKSET_FLAG(flag) boolean nu = toBoolean(value); if (nu == test(flag)) break; if (nu) set(flag); else clear(flag);
//#define CHECKSET_BOOLEAN(prop) boolean nu = toBoolean(value); if (nu == prop) break; prop = nu;
- //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&value.equals(prop))) break; prop=(String)value;
-
- void mark_for_repack() { MARK_REPACK; }
+ //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JS.toString(value).equals(prop))) break; prop=JS.toString(value);
protected Box() { super(null); }
- static Hash boxToCursor = new Hash(500, 3);
+ static Hash boxToCursor = new Hash(500, 3); // FIXME memory leak
public static final int MAX_LENGTH = Integer.MAX_VALUE;
static final Font DEFAULT_FONT;
"Release1", "Release2", "Release3",
"Click1", "Click2", "Click3",
"DoubleClick1", "DoubleClick2", "DoubleClick3",
- "Enter", "Leave", "Move",
- "KeyPressed", "KeyReleased", "PosChange", "SizeChange",
- "childadded", "childremoved",
- "Focused", "Maximized", "Minimized", "Close",
- "icon", "titlebar", "toback", "tofront"
+ "Enter", "Leave", "Move", "ChildChange",
+ "KeyPressed", "KeyReleased", "SizeChange",
+ "Focused", "Maximized", "Minimized", "Close"
};
// Flags //////////////////////////////////////////////////////////////////////
static final int ISROOT = 0x00000080;
static final int REPACK = 0x00000100;
- static final int REFLOW = 0x00000200;
- static final int RESIZE = 0x00000400;
- static final int RECONSTRAIN = 0x00000800;
+ static final int RECONSTRAIN = 0x00000200;
+ static final int REPLACE = 0x00000400;
+
static final int ALIGN_TOP = 0x00001000;
static final int ALIGN_BOTTOM = 0x00002000;
static final int ALIGN_LEFT = 0x00004000;
static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues?
static final int CLIP = 0x00020000;
static final int STOP_UPWARD_PROPAGATION = 0x00040000;
+ static final int MOVED = 0x00080000;
// Instance Data //////////////////////////////////////////////////////////////////////
Box parent = null;
Box redirect = this;
- int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP;
+ int flags = VISIBLE | PACKED | REPACK | RECONSTRAIN | REPLACE | FIXED | STOP_UPWARD_PROPAGATION | CLIP | MOVED;
private String text = null;
private Font font = DEFAULT_FONT;
private VectorGraphics.Affine rtransform = null;
*/
+ //#define DIRTY dirty()
+
// Instance Methods /////////////////////////////////////////////////////////////////////
public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; }
/** invoked when a resource needed to render ourselves finishes loading */
public void perform() throws JSExn {
-
- // FIXME; we can't assume that just because we were performed the image is loaded.
- // as external events have occured, check the state of box
- if (texture != null) {
- if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); }
- else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
- } else {
- Log.warn(Box.class, "perform() called with null texture");
- }
- MARK_REPACK;
- MARK_REFLOW;
- MARK_RESIZE;
- dirty();
+ 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));
+ DIRTY; }
+ else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
}
- public Box getRoot() { return parent == null ? this : parent.getRoot(); }
- public Surface getSurface() { return Surface.fromBox(getRoot()); }
-
// FEATURE: use cx2/cy2 format
/** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */
public void dirty() { dirty(0, 0, width, height); }
// Reflow ////////////////////////////////////////////////////////////////////////////////////////
- Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
- Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
-
private static Box[] frontier = new Box[65535];
- private static int[] frontier_content = new int[65535];
-
- /** pack the boxes into rows and columns; also computes contentwidth */
- void repack() {
- for(Box child = getChild(0); child != null; child = child.nextSibling()) child.repack();
- contentwidth = 0;
- contentheight = 0;
- if (treeSize() == 0) { constrain(); return; }
- //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan contentheight/contentwidth contentwidth/contentheight
+ /** pack the boxes into rows and columns, compute contentwidth */
+ void pack() {
+ if (!test(REPACK)) { constrain(); return; }
+ boolean haskid = false;
+ for(Box child = getChild(0); child != null; child = child.nextSibling()) { haskid = true; child.pack(); }
+ if (!haskid) { clear(REPACK); constrain(); return; }
+ int frontier_size = 0;
+ //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan \
+ // contentheight/contentwidth contentwidth/contentheight
if (test(FIXED) == COLS) {
- int childnum = 0;
- Box lastpacked = null;
- int maxfront = 0;
- int maxrow = 0;
- int rowwidth = 0;
- for(Box child = getChild(0); child != null; child = child.nextSibling(), childnum++) {
- if (!(child.test(PACKED) && child.test(VISIBLE))) continue;
- int col = lastpacked == null ? 0 : (lastpacked.col + lastpacked.colspan);
- int row = lastpacked == null ? 0 : lastpacked.row;
- int colspan = min(cols, child.colspan);
- for(int i=0; i<maxfront; i++) {
- if (col + colspan > cols) {
- row++;
- for(; i>0; i--) row = max(row, frontier[i].row + frontier[i].rowspan);
- col = 0;
- rowwidth = 0;
- continue;
- }
- Box front = frontier[i]; // FIXME: O(nlgn)
- if (front.row + front.rowspan <= row) {
- frontier[i] = frontier[maxfront-1];
- frontier_content[i] = frontier_content[maxfront-1];
- maxfront--;
- frontier[maxfront] = null;
- frontier_content[maxfront] = 0;
- i--;
- continue;
- }
- if ((front.col <= col && front.col + front.colspan > col) ||
- (front.col < (col+colspan) && front.col + front.colspan >= (col+colspan))) {
- col = front.col + front.colspan;
- rowwidth += front.contentwidth; // FIXME: suspect
+ rows = 0;
+ for(Box child = getChild(0); child != null; child = child.nextSibling()) {
+ if (!child.test(PACKED) || !child.test(VISIBLE)) continue;
+ if (cols == 1) { child.row = rows; rows += child.rowspan; child.col = 0; continue; }
+ child.col = (short)(frontier_size <= 0 ? 0 : (frontier[frontier_size-1].col + frontier[frontier_size-1].colspan));
+ child.row = (short)(frontier_size <= 0 ? 0 : frontier[frontier_size-1].row);
+ if (child.col + min(cols,child.colspan) > cols) { child.col = 0; child.row++; }
+ for(int i=0; i<frontier_size; i++)
+ if (frontier[i].row + frontier[i].rowspan <= child.row) {
+ frontier[i--] = frontier[--frontier_size]; frontier[frontier_size] = null;
+ } else if (frontier[i].col<child.col+min(cols,child.colspan)&&frontier[i].col+frontier[i].colspan>child.col) {
+ child.col = (short)(frontier[i].col + frontier[i].colspan);
+ if (child.col + min(cols,child.colspan) > cols) {
+ child.row = (short)(frontier[i].row + frontier[i].rowspan);
+ for(i--; i>0; i--) child.row = (short)min(row, frontier[i].row + frontier[i].rowspan);
+ child.col = (short)0;
+ }
i = -1;
- continue;
- }
- break;
- }
- child.col = (short)col;
- child.row = (short)row;
- maxrow = max(maxrow, child.row + child.rowspan);
- contentwidth = max(contentwidth, rowwidth);
- rowwidth = 0;
- lastpacked = child;
- for(int i=0; i<maxfront; i++) {
- frontier_content[maxfront] =
- max(frontier_content[maxfront], frontier_content[i] + child.contentheight);
- contentheight =
- max(contentheight, frontier_content[i] + child.contentheight);
- }
- frontier[maxfront++] = child;
+ } else break;
+ frontier[frontier_size++] = child;
}
- rows = (short)maxrow;
- for(int i=0; i<maxfront; i++) frontier[i] = null;
- for(int i=0; i<maxfront; i++) frontier_content[i] = 0;
+ for(int i=0; i<frontier_size; i++){ rows=(short)max(rows, frontier[i].row + frontier[i].rowspan); frontier[i] = null; }
}
//#end
+ clear(REPACK);
+ set(RECONSTRAIN); // FIXME: be smarter / more incremental
constrain();
}
- void constrain() {
+ public void constrain() {
+ if (!test(RECONSTRAIN)) return;
+ solve(true);
//#repeat contentwidth/contentheight contentheight/contentwidth minwidth/minheight row/col col/row \
// textwidth/textheight maxwidth/maxheight cols/rows rows/cols colspan/rowspan rowspan/colspan
contentwidth = bound(minwidth,
max(contentwidth, font == null || text == null ? 0 : font.textwidth(text)),
maxwidth);
//#end
+ set(REPLACE); // FIXME: be smarter / more incremental
}
void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
- if (x != this.x || y != this.y || width != this.width || height != this.height) {
- boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
- boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
- //do {
- int thisx = parent == null ? 0 : this.x;
- int thisy = parent == null ? 0 : this.y;
-
- // we can't reenable this until we track
- // surface-relative sizes; imagine the case of a clear
- // surface with nonclear children
-
- /*
- if (texture == null && (text == null || text.equals(""))) {
- if ((fillcolor & 0xff000000) == 0) break;
- // FEATURE: more optimizations here
- if (this.x == x && this.y == y) {
- Box who = (parent == null ? this : parent);
- who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height));
- who.dirty(thisx, thisy+min(this.height,height), min(this.width, width), Math.abs(height-this.height));
- break;
- }
- }
- */
- (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
- this.width = width; this.height = height; this.x = x; this.y = y;
- dirty();
- //} while (false);
- //this.width = width; this.height = height; this.x = x; this.y = y;
- if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
- if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T);
+ if (x == this.x && y == this.y && width == this.width && height == this.height) return;
+ boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
+ int thisx = parent == null ? 0 : this.x;
+ int thisy = parent == null ? 0 : this.y;
+ Box who = (parent == null ? this : parent);
+ if (this.x != x || this.y != y) set(MOVED);
+ if (texture == null && (text == null || text.equals("")) && !test(MOVED)) {
+ if ((fillcolor & 0xff000000) != 0 || parent == null) {
+ who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height));
+ who.dirty(thisx, thisy+min(this.height,height), max(this.width, width), Math.abs(height-this.height));
+ }
+ this.width = width; this.height = height; this.x = x; this.y = y;
+ } else {
+ who.dirty(thisx, thisy, this.width, this.height);
+ this.width = width; this.height = height; this.x = x; this.y = y;
+ DIRTY;
}
+ if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
}
- private static float[] coeff = null;
- private static LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex(100, 100, 300);
- private static LinearProgramming.Simplex lp = new LinearProgramming.Simplex(100, 100, 300);
+ private float targetColumnSize = (float)0.0;
+ private float targetRowSize = (float)0.0;
+ private static float[] sizes = new float[65535];
+ private static float[] sizes_v = new float[65535];
private static int[] regions = new int[65535];
private static int[] regions_v = new int[65535];
+ private static int numregions = 0;
+ private static int numregions_v = 0;
- void place_children() {
+ void solve(boolean findMinimum) {
int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
- int numregions = 0, numregions_v = 0;
//#repeat col/row colspan/rowspan contentwidth/contentheight width/height HSHRINK/VSHRINK numregions/numregions_v \
- // maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp lp_h/lp easy_width/easy_height regions/regions_v
- if (numkids > 0 && cols > 1) do {
- // FIXME: numboxes^2, and damn ugly to boot
- for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) {
- int target = c.col;
- for(boolean stop = false;;) {
- for(int i=0; i<=numregions; i++) {
- if (i == numregions) { regions[numregions++] = target; break; }
- if (target == regions[i]) break;
- if (target < regions[i]) { int tmp = target; target = regions[i]; regions[i] = tmp; }
- }
- if (stop) break;
- stop = true;
- target = min(cols, c.col+c.colspan);
- }
+ // maxwidth/maxheight cols/rows minwidth/minheight regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v \
+ // HSHRINK/VSHRINK
+ if (numkids == 0) {
+ if (findMinimum) contentwidth = 0;
+ else targetColumnSize = 0;
+ } else if (cols == 1) {
+ if (findMinimum) {
+ contentwidth = 0;
+ for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling())
+ contentwidth = max(contentwidth, c.contentwidth);
+ } else {
+ targetColumnSize = width;
}
- if (regions[numregions-1] == cols) numregions--;
- else regions[numregions] = cols;
+ } else if (cols > 1) do {
- /* boolean easy_width = contentwidth >= width; */
- /*
- for(Box c = firstPackedChild(); easy_width && c != null; c = c.nextPackedSibling()) {
- if (c.contentwidth == c.maxwidth) continue;
- if (c.maxwidth == Integer.MAX_VALUE) continue;
- easy_width = false;
- }
- if (easy_width) for(int i=0; i<cols; i++) {
- easy_width = false;
- boolean good = true;
- for(Box c = firstPackedChild(); good && c != null; c = c.nextPackedSibling())
- if (c.col <= i && c.col + c.colspan > i && c.maxwidth < Integer.MAX_VALUE)
- good = false;
- if (good) { easy_width = true; break; }
+ // FIXME: cache these?
+ // compute regions
+ numregions = 0;
+ for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) {
+ regions[numregions++] = c.col;
+ regions[numregions++] = min(cols, c.col+c.colspan);
}
- if (easy_width) break;
- */
- int nc = numregions * 2 + numkids + 1;
- if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
- lp_h.init(nc);
-
- for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
- coeff[numregions*2+numkids] = (float)10000.0; // priority 1: sum of columns no greater than parent
- for(int i=numregions*2; i<numregions*2+numkids; i++) coeff[i] = (float)100.0; // priority 2: honor maxwidths
- for(int i=numregions; i<numregions*2; i++) coeff[i] = (float)(0.1); // priority 3: equalize columns
- lp_h.setObjective(coeff, false);
-
- for(int i=0; i<numregions; i++) lp_h.set_lowbo(i+1, (float)0.0); // invariant: columns cannot have negative size
-
- // invariant: columns must be at least as large as parent
- for(int i=0; i<coeff.length; i++) coeff[i] = (i<numregions) ? (float)(regions[i+1] - regions[i]) : (float)0.0;
- lp_h.add_constraint(coeff, LinearProgramming.GE, (float)width);
-
- // priority 1: sum of columns as close to parent's width as possible
- for(int i=0; i<coeff.length; i++) coeff[i] = (i<numregions) ? (float)(regions[i+1] - regions[i]) : (float)0.0;
- coeff[numregions*2+numkids] = (float)-1.0;
- lp_h.add_constraint(coeff, LinearProgramming.EQ, (float)width);
-
- int childnum = 0;
- for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling()) {
-
- // invariant: honor minwidths
- for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
- for(int r=0; r<numregions; r++)
- if (regions[r] >= child.col && regions[r+1] <= min(child.col+child.colspan,cols))
- coeff[r] = (float)(regions[r+1] - regions[r]);
- lp_h.add_constraint(coeff, LinearProgramming.GE, (float)child.contentwidth);
-
- // priority 2: honor maxwidths
- int child_maxwidth = child.test(HSHRINK) ? min(child.maxwidth, child.contentwidth) : child.maxwidth;
- if (child_maxwidth < Integer.MAX_VALUE) {
- for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
- for(int r=0; r<numregions; r++)
- if (regions[r] >= child.col && regions[r+1] <= min(child.col+child.colspan,cols))
- coeff[r] = (float)(regions[r+1] - regions[r]);
- coeff[numregions*2+childnum] = (float)-1.0;
- lp_h.add_constraint(coeff, LinearProgramming.LE, (float)child_maxwidth);
- }
-
- childnum++;
+ Vec.sortInts(regions, 0, numregions);
+ int j = 0;
+ int newnumregions = numregions;
+ for(int i=1; i<numregions; i++) {
+ if (regions[j] != regions[i]) j++;
+ else newnumregions--;
+ regions[j] = regions[i];
}
+ numregions = newnumregions;
+ if (regions[numregions-1] == cols) numregions--;
+ else regions[numregions] = cols;
+ int target = findMinimum ? 0 : Math.max(width, contentwidth);
+ // priority 0: (inviolable) honor minwidths
+ // priority 1: sum of columns no greater than parent
+ // priority 2: honor maxwidths
// priority 3: equalize columns
- float avg = ((float)width)/((float)numregions);
- for(int r=0; r<numregions; r++) {
- float weight = (float)(regions[r+1] - regions[r]);
- for(int k=0; k<coeff.length; k++) coeff[k] = (float)(k==r?weight:k==(numregions+r)?-1.0:0.0);
- lp_h.add_constraint(coeff, LinearProgramming.LE, avg * weight);
- for(int k=0; k<coeff.length; k++) coeff[k] = (float)(k==r?weight:k==(numregions+r)?1.0:0.0);
- lp_h.add_constraint(coeff, LinearProgramming.GE, avg * weight);
- }
-
- try {
- int result = lp_h.solve();
- switch(result) {
- case LinearProgramming.UNBOUNDED:
- Log.warn(this, "simplex solver claims unboundedness; this should never happen");
- break;
- case LinearProgramming.INFEASIBLE:
- Log.debug(this, "simplex solver claims infeasibility; this should never happen");
- break;
- case LinearProgramming.MILP_FAIL:
- Log.warn(this, "simplex solver claims MILP_FAIL; this should never happen");
- break;
- case LinearProgramming.RUNNING:
- Log.warn(this, "simplex solver still RUNNING; this should never happen");
- break;
- case LinearProgramming.FAILURE:
- Log.warn(this, "simplex solver claims FAILURE; this should never happen");
- break;
+ float targetColumnSize = target == 0 ? 0 : this.targetColumnSize;
+ float last_columnsize = 0;
+ float last_total = 0;
+ float total;
+ boolean first = true;
+ while(true) {
+ total = (float)0.0;
+ for(int r=0; r<numregions; r++) total += (sizes[r] = (float)(targetColumnSize * (regions[r+1]-regions[r])));
+ int minregion = 0;
+ for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling())
+ for(int r=(child.col==0?0:minregion); r<numregions; r++) {
+ if (regions[r+1] < child.col) continue;
+ if (regions[r] >= min(child.col+child.colspan,cols)) { minregion = r; break; }
+ total -= sizes[r];
+ int child_maxwidth = child.test(HSHRINK)?child.contentwidth:child.maxwidth;
+ if (sizes[r] <= (float)(targetColumnSize*(regions[r+1]-regions[r])))
+ if ((child.colspan * targetColumnSize) > (child_maxwidth + (float)0.5))
+ sizes[r] = (float)Math.min(sizes[r], (regions[r+1]-regions[r])*(child_maxwidth/child.colspan));
+ if ((child.colspan * targetColumnSize) < (child.contentwidth - (float)0.5))
+ sizes[r] = (float)Math.max(sizes[r], (regions[r+1]-regions[r])*(child.contentwidth/child.colspan));
+ total += sizes[r];
+ }
+ float save = targetColumnSize;
+ if (Math.abs(total - target) <= (float)1.0) break;
+ if (!first) {
+ if (Math.abs(total - last_total) <= (float)1.0) break;
+ } else {
+ last_columnsize = ((total - target) / (float)cols) + targetColumnSize;
}
- } catch (Error e) {
- Log.warn(this, "got an Error in simplex solver; not sure why this happens");
- return;
+ if (total < target) targetColumnSize += Math.abs((last_columnsize - targetColumnSize) / (float)1.1);
+ else if (total > target) targetColumnSize -= Math.abs((last_columnsize - targetColumnSize) / (float)1.1);
+ last_columnsize = save;
+ last_total = total;
+ first = false;
}
-
+ if (findMinimum) contentwidth = Math.round(total);
+ else this.targetColumnSize = targetColumnSize;
} while(false);
//#end
-
+ }
+
+ void place() {
+ solve(false);
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
if (!child.test(VISIBLE)) continue;
+ if (!child.test(REPLACE)) continue;
int child_width, child_height, child_x, child_y;
if (!child.test(PACKED)) {
child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - Math.abs(child.ax));
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 \
- // child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp easy_width/easy_height \
- // numregions/numregions_v regions/regions_v
- child_width = 0;
+ // child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp \
+ // numregions/numregions_v regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v
child_x = 0;
if (cols == 1) {
- child_x = 0;
child_width = width;
- /*
- } else if (easy_width) {
- */
} else {
+ child_width = 0;
for(int r=0; r<numregions; r++) {
- if (regions[r] >= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) {
- child_width += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r]));
- } else if (regions[r+1] <= child.col) {
- child_x += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r]));
- }
+ if (regions[r] < child.col) child_x += Math.round(sizes[r]);
+ else if (regions[r] < child.col+child.colspan) child_width += Math.round(sizes[r]);
}
}
diff = (child_width - (child.test(HSHRINK) ? child.contentwidth : min(child_width, child.maxwidth)));
child_width -= diff;
//#end
}
+ if (test(MOVED)) child.set(MOVED);
child.resize(child_x, child_y, child_width, child_height);
}
+ clear(MOVED);
for(Box child = getChild(0); child != null; child = child.nextSibling())
if (child.test(VISIBLE) && child.treeSize() > 0)
- child.place_children();
+ child.place();
}
if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null)
buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : fillcolor);
- // FIXME: do aspect in here
if (texture != null && texture.isLoaded)
for(int x = globalx; x < cx2; x += texture.width)
for(int y = globaly; y < cy2; y += texture.height)
// Methods to implement org.ibex.js.JS //////////////////////////////////////
- public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
- public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
- public int localToGlobalX(int x) { return parent == null ? x : parent.globalToLocalX(x + this.x); }
- public int localToGlobalY(int y) { return parent == null ? y : parent.globalToLocalY(y + this.y); }
-
+
public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
switch (nargs) {
case 1: {
return super.callMethod(method, a0, a1, a2, rest, nargs);
}
- public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); }
-
protected boolean isTrappable(Object key, boolean isRead) {
if (key == null) return false;
else if (key instanceof String) {
case "hshrink": return B(test(HSHRINK));
case "vshrink": return B(test(VSHRINK));
case "aspect": return N(aspect);
- case "x": return (parent == null || !test(VISIBLE)) ? N(0) : N(x);
- case "y": return (parent == null || !test(VISIBLE)) ? N(0) : N(y);
+ case "x": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(x) : N(ax);
+ case "y": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(y) : N(ay);
case "cols": return test(FIXED) == COLS ? N(cols) : N(0);
case "rows": return test(FIXED) == ROWS ? N(rows) : N(0);
case "colspan": return N(colspan);
}
}
- void setMaxWidth(Object value) {
- do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false);
- if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth;
+ public void setMaxWidth(Object value) {
+ do { CHECKSET_INT(maxwidth); RECONSTRAIN(); } while(false);
+ if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth;
}
- void setMaxHeight(Object value) {
- do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false);
+ public void setMaxHeight(Object value) {
+ do { CHECKSET_INT(maxheight); RECONSTRAIN(); } while(false);
if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight;
}
+ private void setMinWidth(int m) { if (this.minwidth != m) { RECONSTRAIN(); this.minwidth = m; } }
+ private void setMinHeight(int m) { if (this.minheight != m) { RECONSTRAIN(); this.minheight = m; } }
+
public void put(Object name, Object value) throws JSExn {
if (name instanceof Number) { put(toInt(name), value); return; }
//#switch(name)
- case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty();
- case "strokecolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty();
- case "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty();
- case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty();
- case "strokewidth": CHECKSET_SHORT(strokewidth); dirty();
+ case "text": if (value == null) value = ""; CHECKSET_STRING(text); RECONSTRAIN(); DIRTY;
+ case "strokecolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); DIRTY;
+ case "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); DIRTY;
+ case "strokewidth": CHECKSET_SHORT(strokewidth); DIRTY;
case "shrink": put("hshrink", value); put("vshrink", value);
- case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE;
- case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE;
- case "width": put("maxwidth", value); put("minwidth", value); MARK_RESIZE;
- case "height": put("maxheight", value); put("minheight", value); MARK_RESIZE;
+ case "hshrink": CHECKSET_FLAG(HSHRINK); RECONSTRAIN();
+ case "vshrink": CHECKSET_FLAG(VSHRINK); RECONSTRAIN();
+ case "width": put("maxwidth", value); put("minwidth", value);
+ case "height": put("maxheight", value); put("minheight", value);
case "maxwidth": setMaxWidth(value);
- case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE;
+ case "minwidth": CHECKSET_INT(minwidth); RECONSTRAIN();
if (parent == null && getSurface() != null)
getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight);
case "maxheight": setMaxHeight(value);
- case "minheight": CHECKSET_INT(minheight); MARK_RESIZE;
+ case "minheight": CHECKSET_INT(minheight); RECONSTRAIN();
if (parent == null && getSurface() != null)
getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight);
- case "colspan": if (toInt(value) <= 0) return; CHECKSET_SHORT(colspan); MARK_REPACK_parent;
- case "rowspan": if (toInt(value) <= 0) return; CHECKSET_SHORT(rowspan); MARK_REPACK_parent;
- case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK;
- case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK;
- case "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty();
- case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty();
- case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent;
- case "aspect": CHECKSET_INT(aspect); dirty();
- case "globalx": put("x", N(globalToLocalX(toInt(value))));
- case "globaly": put("y", N(globalToLocalY(toInt(value))));
- case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); MARK_RESIZE;
+ case "colspan": if (toInt(value) > 0) { CHECKSET_SHORT(colspan); if (parent != null) parent.REPACK(); }
+ case "rowspan": if (toInt(value) > 0) { CHECKSET_SHORT(rowspan); if (parent != null) parent.REPACK(); }
+ case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); REPACK();
+ case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); REPACK();
+ case "clip": CHECKSET_FLAG(CLIP); if (parent == null) DIRTY; else parent.DIRTY;
+ case "visible": CHECKSET_FLAG(VISIBLE); RECONSTRAIN(); DIRTY;
+ case "packed": CHECKSET_FLAG(PACKED); if (parent != null) parent.REPACK();
+ case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); REPLACE();
case "cursor": setCursor(value);
case "fill": setFill(value);
case "mouse":
case "font":
if(!(value instanceof Stream)) throw new JSExn("You can only put streams to the font property");
font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize);
- MARK_RESIZE;
- dirty();
- case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); MARK_RESIZE; dirty();
+ RECONSTRAIN();
+ DIRTY;
+ case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); RECONSTRAIN(); DIRTY;
case "x": if (parent==null && Surface.fromBox(this)!=null) {
CHECKSET_INT(x);
} else {
if (test(PACKED) && parent != null) return;
- dirty(); CHECKSET_INT(ax);
- dirty(); MARK_RESIZE;
- dirty();
+ CHECKSET_INT(ax);
+ REPLACE();
}
case "y": if (parent==null && Surface.fromBox(this)!=null) {
CHECKSET_INT(y);
} else {
if (test(PACKED) && parent != null) return;
- dirty(); CHECKSET_INT(ay);
- dirty(); MARK_RESIZE;
- dirty();
+ CHECKSET_INT(ay);
+ REPLACE();
}
case "titlebar":
if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value));
super.put(name,value);
-
+
case "Press1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
case "Press2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
case "Press3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
case "_HScroll": propagateDownward(name, value, false);
case "_VScroll": propagateDownward(name, value, false);
- case "PosChange": return;
case "SizeChange": return;
- case "childadded": return;
- case "childremoved": return;
+ case "ChildChange": return;
case "Enter": return;
case "Leave": return;
} else {
throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass());
}
- dirty();
+ DIRTY;
}
// FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down
}
if (!obscured && !found)
- if ("_Move".equals(name) || wasinside)
+ if ("_Move".equals(name) || name.startsWith("_Release") || wasinside)
if (name != null)
putAndTriggerTrapsAndCatchExceptions(name.substring(1), value);
}
// Trivial Helper Methods (should be inlined) /////////////////////////////////////////
+ void mark_for_repack() { REPACK(); }
+ public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); }
+ public Box getRoot() { return parent == null ? this : parent.getRoot(); }
+ public Surface getSurface() { return Surface.fromBox(getRoot()); }
+ Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
+ Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
+ public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
+ public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
+ public int localToGlobalX(int x) { return parent == null ? x : parent.globalToLocalX(x + this.x); }
+ public int localToGlobalY(int y) { return parent == null ? y : parent.globalToLocalY(y + this.y); }
+
static short min(short a, short b) { if (a<b) return a; else return b; }
static int min(int a, int b) { if (a<b) return a; else return b; }
static float min(float a, float b) { if (a<b) return a; else return b; }
/** remove the i^th child */
public void removeChild(int i) {
Box b = getChild(i);
- MARK_REFLOW_b;
- b.dirty();
+ b.RECONSTRAIN();
+ b.DIRTY;
b.clear(MOUSEINSIDE);
deleteNode(i);
b.parent = null;
- MARK_REFLOW;
- putAndTriggerTrapsAndCatchExceptions("childremoved", b);
+ RECONSTRAIN();
+ putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
}
public void put(int i, Object value) throws JSExn {
}
if (redirect == null) {
- if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
+ if (value == null) putAndTriggerTrapsAndCatchExceptions("ChildChange", getChild(i));
else JS.warn("attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
- if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
+ if (value != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", value);
redirect.put(i, value);
if (value == null) {
Box b = (Box)redirect.get(new Integer(i));
- if (b != null) putAndTriggerTrapsAndCatchExceptions("childremoved", b);
+ if (b != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
}
} else if (value == null) {
if (i < 0 || i > treeSize()) return;
Box b = getChild(i);
removeChild(i);
- putAndTriggerTrapsAndCatchExceptions("childremoved", b);
+ putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
} else {
Box b = (Box)value;
b.parent = this;
// need both of these in case child was already uncalc'ed
- MARK_REFLOW_b;
- MARK_REFLOW;
+ b.RECONSTRAIN();
+ RECONSTRAIN();
- b.dirty();
- putAndTriggerTrapsAndCatchExceptions("childadded", b);
+ b.DIRTY;
+ putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
}
}