X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=b5585fc17b15bbacc906ecc4d753232f8e3804b2;hb=020decf73910d5890b0cd0e910255629c484ce52;hp=13717cf2852a79aa794133524c30a96b9fb1b29b;hpb=fd4126d20d5d33fb5e122d76616a439f7177cd03;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 13717cf..b5585fc 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -67,7 +67,7 @@ public final class Box extends JSScope implements Scheduler.Task { static { Font f = null; - try { f = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } + try { f = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } catch(JSExn e) { Log.info(Box.class, "should never happen: "+e); } DEFAULT_FONT = f; } @@ -75,12 +75,10 @@ public final class Box extends JSScope implements Scheduler.Task { // FIXME update these // box properties can not be trapped static final String[] props = new String[] { - "fill", "stroke", "image", "tile", "fixedaspect", "text", "path", "font", "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows", - "colspan", "rowspan", "align", "visible", "absolute", "globalx", "globaly", - "minwidth", "maxwidth", "minheight", "maxheight", - "numchildren", "redirect", "cursor", "mousex", "mousey", "xwt", "static", - "mouseinside", "root", "thisbox", "indexof" + "colspan", "rowspan", "align", "visible", "packed", "globalx", "globaly", + "minwidth", "maxwidth", "minheight", "maxheight", "indexof", "thisbox", "clip", + "numchildren", "redirect", "cursor", "mouse", "surface" }; // FIXME update these @@ -177,7 +175,7 @@ public final class Box extends JSScope implements Scheduler.Task { // 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 { Res res = texture.res; texture = null; throw new JSExn("image not found: "+res); } + else { Stream res = texture.res; texture = null; throw new JSExn("image not found: "+res); } } MARK_REPACK; @@ -262,6 +260,12 @@ public final class Box extends JSScope implements Scheduler.Task { 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 @@ -272,6 +276,7 @@ public final class Box extends JSScope implements Scheduler.Task { 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(); @@ -302,7 +307,8 @@ public final class Box extends JSScope implements Scheduler.Task { int increment = max(1, x_slack / cols); startslack = x_slack; for(short col=0; col < cols; col++) { - int diff = min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col]; + // FIXME: double check this + int diff = min(min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col], x_slack); x_slack -= diff; colWidth[col] += diff; } @@ -419,7 +425,7 @@ public final class Box extends JSScope implements Scheduler.Task { return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name); //#switch(name) - case "surface": return parent == null ? null : parent.get("surface"); + case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); case "indexof": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); @@ -437,12 +443,16 @@ public final class Box extends JSScope implements Scheduler.Task { 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 "width": return N(width); - case "height": return N(height); 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 "rowspan": return N(rowspan); + case "width": return N(width); + case "height": return N(height); + case "minwidth": return N(minwidth); + case "maxwidth": return N(maxwidth); + case "minheight": return N(minheight); + case "maxheight": return N(maxheight); case "clip": return B(test(CLIP)); case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T))); case "packed": return B(test(PACKED)); @@ -455,10 +465,6 @@ public final class Box extends JSScope implements Scheduler.Task { throw new JSExn("you cannot read from the box.mouse property in background thread context"); return new Mouse(); case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren"); - case "minwidth": return N(minwidth); - case "maxwidth": return N(maxwidth); - case "minheight": return N(minheight); - case "maxheight": return N(maxheight); case "redirect": return redirect == null ? null : redirect == this ? T : redirect.get("redirect"); case "Minimized": if (parent == null && getSurface() != null) return B(getSurface().minimized); default: return super.get(name); @@ -526,10 +532,8 @@ public final class Box extends JSScope implements Scheduler.Task { case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value); // FEATURE case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true); - case "toback": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toBack(); } - case "tofront": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toFront(); } case "redirect": if (redirect == this) redirect = (Box)value; else Log.info(this, "redirect can only be set once"); - case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty(); + case "font": 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.res, toInt(value)); MARK_RESIZE; dirty(); case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); } case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); } @@ -631,8 +635,8 @@ public final class Box extends JSScope implements Scheduler.Task { dirty(); return; } - if (!(value instanceof Res)) return; - texture = Picture.load((Res)value, this); + if (!(value instanceof Stream)) return; + texture = Picture.load((Stream)value, this); } // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down