// --- Phase 1 ----------------------------------------------------------------------
// assign children to their row/column positions (assuming constrained columns)
if ((rows == 0 && cols == 0) || (rows != 0 && cols != 0)) throw new Error("rows == " + rows + " cols == " + cols);
- //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
+ //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
if (rows == 0 && numChildren() != 0) {
int[] numRowsInCol = new int[cols]; // the number of cells occupied in each column
Box child = getChild(0);
// --- Phase 2 ----------------------------------------------------------------------
// compute the min/max sizes of the columns and rows and set our contentwidth
- //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows
+ //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows textwidth/textheight
if (numChildren() != 0) {
int numCols = cols;
if (numCols == 0)
if (image != null)
if ((flags & TILE_FLAG) != 0) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
- else renderStretchedImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ else buf.drawPicture(image, globalx, globaly, clipx, clipy, clipx + clipw, clipy + cliph);
if (text != null && !text.equals(""))
renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
}
}
- void renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
- // FIXME: wrong
- buf.drawPicture(image, clipx, clipy, clipx + clipw, clipy + cliph, 0, 0, image.getWidth(), image.getHeight());
- }
-
void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, PixelBuffer buf) {
+ /*
+ FIXME
int iw = image.getWidth();
int ih = image.getHeight();
for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
buf.drawPicture(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
}
}
+ */
}
void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
for(int i=0; i<text.length(); i++) {
- // FIXME: clipping
- char c = text.charAt(i);
- Glyph g = Glyph.getGlyph(font, fontsize, c);
- buf.drawPictureAlphaOnly(g.p,
- x,
- y + g.max_ascent - g.baseline,
- x + g.p.getWidth(),
- y + g.max_ascent - g.baseline + g.p.getHeight(),
- 0, 0,
- g.p.getWidth(), g.p.getHeight(),
- textcolor);
- x += g.advance;
+ final char c = text.charAt(i);
+ Glyph g = Glyph.getCachedGlyph(font, fontsize, c);
+ if (g != null) {
+ int top = y + g.max_ascent - g.baseline + g.max_descent;
+ if (g.p != null)
+ buf.drawPictureAlphaOnly(g.p, x, top,
+ clipx, clipy, clipx + clipw, clipy + cliph, textcolor);
+ x += g.advance;
+ } else {
+ final int fontsize_final = fontsize;
+ final Res font_final = font;
+ ThreadMessage.newthread(new JS.Callable() {
+ public Object call(JS.Array args) {
+ Glyph.renderGlyph(font_final, fontsize_final, c);
+ recompute_font();
+ Box b = Box.this; MARK_FOR_REFLOW_b;
+ dirty();
+ return null;
+ } });
+ return;
+ }
}
}
return parent.getRoot();
}
+ public void recompute_font() {
+ try {
+ MARK_FOR_REFLOW_this;
+ textwidth = 0;
+ textheight = 0;
+ if (text == null) return;
+ for(int i=0; i<text.length(); i++) {
+ Glyph g = Glyph.getCachedGlyph(font, fontsize, text.charAt(i));
+ if (g == null) {
+ final int fontsize_final = fontsize;
+ final Res font_final = font;
+ final char c = text.charAt(i);
+ ThreadMessage.newthread(new JS.Callable() {
+ public Object call(JS.Array args) {
+ Glyph.renderGlyph(font_final, fontsize_final, c);
+ recompute_font();
+ Box b = Box.this; MARK_FOR_REFLOW_b;
+ dirty();
+ return null;
+ } });
+ } else {
+ textwidth += g.advance;
+ textheight = g.max_ascent;
+ }
+ }
+ } catch (Exception e) {
+ Log.log(this, e);
+ }
+ }
+
// Trivial Helper Methods (should be inlined) /////////////////////////////////////////
static {
specialBoxProperties.put("fill", new ColorBoxProperty() {
+ public void put(Box b, Object value) {
+ if (value != null && value instanceof Res) {
+ b.image = Picture.fromRes((Res)value);
+ b.minwidth = b.image.getWidth();
+ b.minheight = b.image.getHeight();
+ b.dirty();
+ } else {
+ super.put(b, value);
+ }
+ }
public int getColor(Box b) { return b.fillcolor; }
public void putColor(Box b, int argb) { b.fillcolor = argb; }
});
if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b;
b.textwidth = b.textheight = 0;
} else {
- try {
- MARK_FOR_REFLOW_b;
- b.textwidth = 0;
- for(int i=0; i<b.text.length(); i++) {
- Glyph g = Glyph.getGlyph(b.font, b.fontsize, b.text.charAt(i));
- b.textwidth += g.advance;
- b.textheight = g.max_ascent + g.max_descent;
- }
- } catch (Exception e) {
- Log.log(this, e);
- }
+ b.recompute_font();
}
b.dirty();
} });
MARK_FOR_REFLOW_b;
b.flags |= FONT_CHANGED_FLAG;
b.dirty();
+ b.recompute_font();
} });
specialBoxProperties.put("fontsize", new SpecialBoxProperty() {
MARK_FOR_REFLOW_b;
b.flags |= FONT_CHANGED_FLAG;
b.dirty();
+ b.recompute_font();
} });
specialBoxProperties.put("strokewidth", new SpecialBoxProperty() {
public Object get(Box b) { return b; }
public void put(Box b, Object value) {
if (value == null) b.remove();
- else if (value.equals("window") || value.equals("frame")) Platform.createSurface(b, value.equals("frame"), true);
else if (Log.on) Log.log(this, "put invalid value to 'thisbox' property: " + value);
}
});
return new Integer(b.x);
}
public void put(Box b, Object value) {
- if (!((b.flags & NOTPACKED_FLAG) != 0)) return;
+ if (!((b.flags & NOTPACKED_FLAG) != 0) && (b.parent != null || b.surface == null)) return;
int x = stoi(value);
if (x == b.x) return;
b.dirty();
});
//#end
- //#repeat width/height minwidth/minheight maxwidth/maxheight
+ //#repeat width/height height/width minwidth/minheight maxwidth/maxheight true/false
specialBoxProperties.put("width", new SpecialBoxProperty() {
public Object get(Box b) { return new Integer(b.width); }
public void put(Box b, Object value) {
- b.width = stoi(value);
+ int newval = stoi(value);
if (b.parent == null && b.surface != null) {
- b.surface.setSize();
+ // hack to circumvent #repeat
+ int other = b.height;
+ if (true) b.surface.setSize(newval, other);
+ else b.surface.setSize(other, newval);
MARK_FOR_REFLOW_b;
} else {
- if (b.minwidth == b.width && b.maxwidth == b.width) return;
- b.minwidth = b.maxwidth = b.width;
+ if (b.minwidth == newval && b.maxwidth == newval) return;
+ b.minwidth = b.maxwidth = newval;
MARK_FOR_REFLOW_b;
}
} });
} });
specialBoxProperties.put("image", new SpecialBoxProperty() {
- /* FIXME
- public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); }
- */
+ public Object get(Box b) { return b.image == null ? null : b.image.res; }
public void put(Box b, Object value) {
- //if (image != null) System.out.println("hit");
if (value == null) {
b.image = null;
} else if (value instanceof Res) {
projects / org.ibex.core.git / blobdiff