* SizeChanges trigger an Surface.abort; if rendering were done in the same
* pass, rendering work done prior to the Surface.abort would be wasted.
*/
-public final class Box extends JSScope {
+public final class Box extends JSScope implements Scheduler.Task {
// Macros //////////////////////////////////////////////////////////////////////
private String text = null;
private Font font = DEFAULT_FONT;
- private Picture.Holder texture;
+ private Picture texture;
private short strokewidth = 1;
private int fillcolor = 0x00000000;
private int strokecolor = 0xFF000000;
// Instance Methods /////////////////////////////////////////////////////////////////////
+
+ /** invoked when a resource needed to render ourselves finishes loading */
+ public void perform() {
+ MARK_REPACK;
+ MARK_REFLOW;
+ MARK_RESIZE;
+ dirty();
+ }
+
public Box getRoot() { return parent == null ? this : parent.getRoot(); }
public Surface getSurface() { return Surface.fromBox(getRoot()); }
private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
// FEATURE reimplement, but we're destroying this
- if (x != this.x || y != this.y || width != this.width || height != this.height) {
+ // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345
+ //if (x != this.x || y != this.y || width != this.width || height != this.height) {
(parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
catch (Exception e) { Log.log(this, e); }
if (poschange) try { putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ }
catch (Exception e) { Log.log(this, e); }
- }
+ //}
}
private void resize_children() {
if ((fillcolor & 0xFF000000) != 0x00000000)
buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor);
- if (texture != null && texture.picture != null)
- for(int x = globalx; x < cx2; x += texture.picture.getWidth())
- for(int y = globaly; y < cy2; y += texture.picture.getHeight())
- buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2);
+ if (texture != null && texture.isLoaded)
+ for(int x = globalx; x < cx2; x += texture.width)
+ for(int y = globaly; y < cy2; y += texture.height)
+ buf.drawPicture(texture, x, y, cx1, cy1, cx2, cy2);
if (text != null && !text.equals("") && font != null)
if (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1)
- font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2,
- new Scheduler.Task() { public void perform() { Box b = Box.this; MARK_REFLOW_b; dirty(); }});
+ font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this);
for(Box b = getChild(0); b != null; b = b.nextSibling())
b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null);
case "shrink": put("hshrink", value); put("vshrink", value);
case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE;
case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE;
- case "width": if (parent==null&&Surface.fromBox(this)!=null) { CHECKSET_INT(width); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; }
- case "height": if (parent == null&&Surface.fromBox(this)!=null) { CHECKSET_INT(height); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; }
+ case "width": if (parent==null&&Surface.fromBox(this)!=null) { Surface.fromBox(this).setWidth(toInt(value)); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; }
+ case "height": if (parent == null&&Surface.fromBox(this)!=null) { Surface.fromBox(this).setHeight(toInt(value)); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; }
case "maxwidth": CHECKSET_INT(maxwidth); MARK_RESIZE;
case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE;
case "maxheight": CHECKSET_INT(maxheight); MARK_RESIZE;
case "SizeChange": return; // prevent stuff from hitting the Hash
case "childadded": return; // prevent stuff from hitting the Hash
case "childremoved": return; // prevent stuff from hitting the Hash
- case "thisbox": {
- if (value != null) break;
- if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
- Surface surface = Surface.fromBox(this);
- if (surface != null) surface.dispose(true);
- }
+ case "thisbox": if (value == null) removeSelf();
default: super.put(name, value);
//#end
}
return;
}
if (!(value instanceof Res)) return;
- texture = Picture.fromRes((Res)value, null);
- if (texture != null) {
- minwidth = texture.picture.getWidth();
- minheight = texture.picture.getHeight();
+
+
+ // FIXME
+ texture = Picture.load((Res)value, this);
+ if (texture.isLoaded) {
+ minwidth = texture.width;
+ minheight = texture.height;
MARK_REFLOW;
dirty();
return;
}
- texture = Picture.fromRes((Res)value, new Scheduler.Task() { public void perform() {
- minwidth = texture.picture.getWidth();
- minheight = texture.picture.getHeight();
+ texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() {
+ // FIXME pass this instead of a new Task?
+ minwidth = texture.width;
+ minheight = texture.height;
Box b = Box.this; MARK_REFLOW_b;
dirty();
} });
// Tree Manipulation /////////////////////////////////////////////////////////////////////
+ void removeSelf() {
+ if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
+ Surface surface = Surface.fromBox(this);
+ if (surface != null) surface.dispose(true);
+ }
+
/** remove the i^th child */
public void removeChild(int i) {
Box b = getChild(i);