//#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;
+ //#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 //////////////////////////////////////////////////////////////////////
}
private static float[] coeff = null;
- private static Simplex lp_h = new Simplex(100, 100, 300);
- private static Simplex lp = new Simplex(100, 100, 300);
+ private static Simplex lp_h = new Simplex(65535, 65535, 65535);
+ private static Simplex lp = new Simplex(65535, 65535, 65535);
- // FIXME: numboxes^2, and damn ugly to boot
private static int[] regions = new int[65535];
private static int[] regions_v = new int[65535];
private static int numregions = 0;
private void computeRegions() {
numregions = 0;
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);
- }
+ regions[numregions++] = c.col;
+ regions[numregions++] = min(cols, c.col+c.colspan);
+ }
+ 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;
}
//#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 \
// computeRegions/computeRegions_v
- if (numkids > 0 && cols > 1) do {
+ if (numkids > 0) do {
computeRegions();
int nc = numregions * 3 + numkids * 2 + 3;
if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
if (!findMinimum) {
- coeff[numregions*2+numkids] = (float)10000.0; // priority 1: sum of columns no greater than parent
+ 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
} else {
}
lp_h.setObjective(coeff, false);
- for(int i=0; i<numregions; i++) {
- for(int j=0; j<coeff.length; j++) coeff[j] = j==i ? (float)1.0 : (float)0.0;
- lp_h.add_constraint(coeff, Simplex.GE, (float)0.0);
- }
-
// 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;
- if (!findMinimum) lp_h.add_constraint(coeff, Simplex.LE, (float)width);
+ if (!findMinimum) lp_h.add_constraint(coeff, Simplex.EQ, (float)width);
else lp_h.add_constraint(coeff, Simplex.LE, (float)0);
int childnum = 0;
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);
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;
}
if (!obscured && !found)
- if ("_Move".equals(name) || wasinside)
+ if ("_Move".equals(name) || name.startsWith("_Release") || wasinside)
if (name != null)
putAndTriggerTrapsAndCatchExceptions(name.substring(1), value);
}
deleteNode(i);
b.parent = null;
MARK_REFLOW;
- putAndTriggerTrapsAndCatchExceptions("childremoved", b);
+ 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;
MARK_REFLOW;
b.dirty();
- putAndTriggerTrapsAndCatchExceptions("childadded", b);
+ putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
}
}
projects / org.ibex.core.git / blobdiff