// Flags ///////////////////////////////////////////////////////////////////////////////
short flags = 0;
- static int MOUSEINSIDE_FLAG = 0x00000001;
- static int INVISIBLE_FLAG = 0x00000002;
- static int ABSOLUTE_FLAG = 0x00000004;
- static int HSHRINK_FLAG = 0x00000008;
- static int VSHRINK_FLAG = 0x00000010;
- static int TILE_FLAG = 0x00000020;
- static int FONT_CHANGED_FLAG = 0x00000040; // set when font changes, cleared during repack
- static int ISROOT_FLAG = 0x00000080;
- static int NOCLIP_FLAG = 0x00000100;
+ static final int MOUSEINSIDE_FLAG = 0x00000001;
+ static final int INVISIBLE_FLAG = 0x00000002;
+ static final int NOTPACKED_FLAG = 0x00000004;
+ static final int HSHRINK_FLAG = 0x00000008;
+ static final int VSHRINK_FLAG = 0x00000010;
+ static final int FONT_CHANGED_FLAG = 0x00000040; // set when font changes, cleared during repack
+ static final int ISROOT_FLAG = 0x00000080;
+ static final int NOCLIP_FLAG = 0x00000100;
+ static final int ALIGN_TOP_FLAG = 0x00001000;
+ static final int ALIGN_BOTTOM_FLAG = 0x00002000;
+ static final int ALIGN_LEFT_FLAG = 0x00004000;
+ static final int ALIGN_RIGHT_FLAG = 0x00008000;
+ static final int ALIGN_FLAGS = 0x0000f000;
// Geometry ////////////////////////////////////////////////////////////////////////////
public LENGTH minheight = 0;
public LENGTH maxwidth = MAX_LENGTH;
public LENGTH maxheight = MAX_LENGTH;
- private LENGTH hpad = 0;
- private LENGTH vpad = 0;
private String text = null;
private Res font = null;
private int fontsize = 10;
public LENGTH height = 0;
private int row = 0; // FEATURE use a short
private int col = 0; // FEATURE use a short
- private LENGTH contentwidth = 0; // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad)
+ private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth))
private LENGTH contentheight = 0;
+ private LENGTH offset_x = 0;
+ private LENGTH offset_y = 0;
// Rendering Properties ///////////////////////////////////////////////////////////
private VectorGraphics.VectorPath path = null;
private VectorGraphics.Affine transform = null;
+
+ private VectorGraphics.RasterPath rpath = null;
+ private VectorGraphics.Affine rtransform = null;
+
//private VectorGraphics.Paint fill = null;
//private VectorGraphics.Paint stroke = null;
int strokewidth = 1;
if (isinside && cursor != null) getRoot().cursor = cursor;
// if the mouse has moved into our padding region, it is considered 'outside' all our children
- if (!(mousex >= hpad && mousey >= vpad && mousex < width - hpad && mousey < height + vpad)) forceleave = true;
+ if (!(mousex >= 0 && mousey >= 0 && mousex < width && mousey < height)) forceleave = true;
for(Box b = getChild(numChildren() - 1); b != null; b = b.prevSibling()) {
b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave);
// Reflow ////////////////////////////////////////////////////////////////////////////////////////
+ /** only for use on the root box */
void reflow() { reflow(width, height); }
void reflow(int new_width, int new_height) {
repack();
if (Surface.abort) return;
+ //#repeat width/height new_width/new_height HSHRINK_FLAG/VSHRINK_FLAG contentwidth/contentheight minwidth/minheight maxwidth/maxheight
+ new_width = bound(max(contentwidth, minwidth),
+ new_width,
+ ((flags & HSHRINK_FLAG) != 0) ? max(contentwidth, minwidth) : maxwidth);
+ //#end
resize(x, y, new_width, new_height);
}
/** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */
void repack() {
if (!needs_reflow) return;
- if (numChildren() == 0) {
- contentwidth = max(textwidth + 2 * hpad, minwidth);
- contentheight = max(textheight + 2 * vpad, minheight);
- if (path != null) {
- contentwidth = max(contentwidth, path.boundingBoxWidth());
- contentheight = max(contentheight, path.boundingBoxHeight());
- }
- return;
- }
+ contentwidth = contentheight = 0;
// --- Phase 0 ----------------------------------------------------------------------
// recurse
// --- 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
- if (rows == 0) {
+ //#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);
- for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
+ for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
OUTER: for(int row=0; child != null; row++) {
for(int col=0; child != null && col < cols;) {
INNER: while(true) { // scan across the row, looking for an unoccupied gap at least as wide as the child
child.row = row;
col += min(cols, child.colspan);
child = child.nextSibling();
- for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
+ for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
}
}
}
// --- 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 hpad/vpad
- contentwidth = 2 * hpad;
- int numCols = cols;
- if (numCols == 0)
+ //#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)
+ for(Box child = getChild(0); child != null; child = child.nextSibling())
+ numCols = max(numCols, child.col + child.colspan);
+ LENGTH[] colWidth = new LENGTH[numCols];
for(Box child = getChild(0); child != null; child = child.nextSibling())
- numCols = max(numCols, child.col + child.colspan);
- LENGTH[] colWidth = new LENGTH[numCols];
- for(Box child = getChild(0); child != null; child = child.nextSibling())
- if (!(((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)))
- colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
- for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
- contentwidth = max(textwidth + 2 * hpad, contentwidth);
+ if (!(((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)))
+ colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
+ for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
+ }
+ contentwidth = max(textwidth, contentwidth);
contentwidth = bound(minwidth, contentwidth, maxwidth);
- if (path != null) {
- contentwidth = max(contentwidth, path.boundingBoxWidth());
- contentheight = max(contentheight, path.boundingBoxHeight());
+ //#end
+
+ offset_x = 0;
+ if ((flags & NOTPACKED_FLAG) == 0) {
+ if (path != null) {
+ if (rpath == null) rpath = path.realize(transform == null ? VectorGraphics.Affine.identity() : transform);
+ if ((flags & HSHRINK_FLAG) != 0) contentwidth = max(contentwidth, rpath.boundingBoxWidth());
+ if ((flags & VSHRINK_FLAG) != 0) contentheight = max(contentheight, rpath.boundingBoxHeight());
+ // FIXME: separate offset_x needed for the path
+ }
+ //#repeat x1/y1 x2/y2 x3/y3 x4/y4 contentwidth/contentheight left/top right/bottom
+ int x1 = transform == null ? 0 : (int)transform.multiply_px(0, 0);
+ int x2 = transform == null ? 0 : (int)transform.multiply_px(contentwidth, 0);
+ int x3 = transform == null ? contentwidth : (int)transform.multiply_px(contentwidth, contentheight);
+ int x4 = transform == null ? contentwidth : (int)transform.multiply_px(0, contentheight);
+ int left = min(min(x1, x2), min(x3, x4));
+ int right = max(max(x1, x2), max(x3, x4));
+ contentwidth = max(contentwidth, right - left);
+ offset_x = -1 * left;
+ //#end
}
- //#end
}
-
+
private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
//#end
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
- if (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)) continue;
+ if (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)) continue;
//#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG numCols/numRows
colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
for(int i=child.col; i<child.col+child.colspan && i<numCols; i++)
// --- Phase 3 ----------------------------------------------------------------------
// hand out the slack
int slack;
- //#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 hpad/vpad
- slack = width - 2 * hpad;
+ //#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
+ slack = width;
for(int i=0; i<numCols; i++) slack -= colWidth[i];
if (numChildren() > 0)
while(slack > 0) {
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
if ((child.flags & INVISIBLE_FLAG) != 0) continue;
int child_x = 0, child_y = 0, child_width = 0, child_height = 0;
- if ((child.flags & ABSOLUTE_FLAG) != 0) {
+ if ((child.flags & NOTPACKED_FLAG) != 0) {
child_x = child.x;
child_y = child.y;
- child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x - hpad);
- child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y - vpad);
+ child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x);
+ child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y);
} else {
int diff;
- //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight hpad/vpad child_x/child_y child_width/child_height
+ //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight child_x/child_y child_width/child_height ALIGN_LEFT_FLAG/ALIGN_TOP_FLAG ALIGN_RIGHT_FLAG/ALIGN_BOTTOM_FLAG
child_width = 0; for(int i=child.col; i<child.col+child.colspan && i<colWidth.length; i++) child_width += colWidth[i];
diff = bound(child.contentwidth, child_width, ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : child.maxwidth) - child_width;
- child_x = max(hpad, marginWidth / 2); for(int i=0; i<child.col; i++) child_x += colWidth[i];
+ if (transform == null) {
+ if ((flags & ALIGN_RIGHT_FLAG) != 0) child_x = marginWidth;
+ else if ((flags & ALIGN_LEFT_FLAG) == 0) child_x = marginWidth / 2;
+ }
+ for(int i=0; i<child.col; i++) child_x += colWidth[i];
if (diff < 0) child_x += -1 * (diff / 2);
child_width += diff;
//#end
int globaly = parenty + (parent == null ? 0 : y);
// intersect the x,y,w,h rendering window with ourselves; quit if it's empty
+
if ((flags & NOCLIP_FLAG) == 0) {
clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
}
if (clipw <= 0 || cliph <= 0) return;
- if ((fillcolor & 0xFF000000) != 0x00000000)
- buf.fillTrapezoid(clipx, clipx + clipw, clipy, clipx, clipx + clipw, clipy + cliph, fillcolor);
+ if (path == null && (fillcolor & 0xFF000000) != 0x00000000) {
+ VectorGraphics.VectorPath path2 = VectorGraphics.parseVectorPath("M0,0H" + width + "V" + height + "H0V0z");
+ path2.realize(a).fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
+ }
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);
+ for(int x = globalx; x < clipx + clipw; x += image.getWidth())
+ for(int y = globaly; y < clipy + cliph; y += image.getHeight())
+ buf.drawPicture(image, x, y, clipx, clipy, clipx + clipw, clipy + cliph);
if (text != null && !text.equals(""))
- renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ Glyph.rasterizeGlyphs(font, fontsize, text, buf, textcolor, globalx, globaly, clipx, clipy, clipw + clipx, clipy + cliph,
+ new Callback() { public Object call(Object arg) {
+ Box.this.dirty();
+ Box b = Box.this;
+ MARK_FOR_REFLOW_b;
+ b.dirty();
+ return null;
+ }});
if (path != null) {
- VectorGraphics.RasterPath rp = path.realize(a);
- if ((strokecolor & 0xff000000) != 0) rp.stroke(buf, 1, strokecolor);
- if ((fillcolor & 0xff000000) != 0) rp.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
- }
-
- // now subtract the pad region from the clip region before proceeding
- if ((flags & NOCLIP_FLAG) == 0) {
- clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
- cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
- clipx = max(clipx, globalx + hpad);
- clipy = max(clipy, globaly + vpad);
- }
-
- for(Box b = getChild(0); b != null; b = b.nextSibling()) {
- a.translate(b.x, b.y);
- b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf, a);
- a.translate(-1 * b.x, -1 * b.y);
- }
- }
-
- 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) {
- int iw = image.getWidth();
- int ih = image.getHeight();
- for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
- for(int j=(y - y)/ih; j<= (y + h - y)/ih; j++) {
-
- int dx1 = max(i * iw + x, x);
- int dy1 = max(j * ih + y, y);
- int dx2 = min((i+1) * iw + x, x + w);
- int dy2 = min((j+1) * ih + y, y + h);
-
- int sx1 = dx1 - (i*iw) - x;
- int sy1 = dy1 - (j*ih) - y;
- int sx2 = dx2 - (i*iw) - x;
- int sy2 = dy2 - (j*ih) - y;
-
- if (dx2 - dx1 > 0 && dy2 - dy1 > 0 && sx2 - sx1 > 0 && sy2 - sy1 > 0)
- buf.drawPicture(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
+ if (rtransform == null) rpath = null;
+ else if (!rtransform.equalsIgnoringTranslation(a)) rpath = null;
+ else {
+ rpath.translate((int)(a.e - rtransform.e), (int)(a.f - rtransform.f));
+ rtransform = a.copy();
+ }
+ if (rpath == null) {
+ rtransform = a;
+ rpath = path.realize(a == null ? VectorGraphics.Affine.identity() : a);
}
+ if ((strokecolor & 0xff000000) != 0) rpath.stroke(buf, 1, strokecolor);
+ if ((fillcolor & 0xff000000) != 0) rpath.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
}
- }
- 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 + hpad,
- y + vpad + g.max_ascent - g.baseline,
- x + hpad + g.p.getWidth(),
- y + vpad + g.max_ascent - g.baseline + g.p.getHeight(),
- 0, 0,
- g.p.getWidth(), g.p.getHeight(),
- textcolor);
- x += g.advance;
+ for(Box b = getChild(0); b != null; b = b.nextSibling()) {
+ VectorGraphics.Affine a2 = VectorGraphics.Affine.translate(b.x, b.y);
+ if (transform != null) a2.multiply(transform);
+ a2.multiply(VectorGraphics.Affine.translate(offset_x, offset_y));
+ a2.multiply(a);
+ b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf, a2);
}
}
*/
public void put(int i, Object value) {
if (i < 0) return;
-
+ Trap t = value == null ? (Trap)get("childremoved", Trap.class) : (Trap)get("childadded", Trap.class);
+
if (value != null && !(value instanceof Box)) {
- if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to anything other than a box");
- } else if (redirect == null) {
- if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
- put("0", (Box)value);
+ if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+ return;
+ }
+
+ if (redirect == null) {
+ if (t != null) t.perform(value);
+ else if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
Box b = value == null ? (Box)redirect.get(i) : (Box)value;
redirect.put(i, value);
- put("0", b);
+ if (t != null) t.perform(value);
} else if (value == null) {
if (i >= 0 && i < numChildren()) {
Box b = getChild(i);
b.remove();
- put("0", b);
+ if (t != null) t.perform(b);
}
} else {
Box newnode = (Box)value;
MARK_FOR_REFLOW_this;
newnode.dirty();
-
- // note that JavaScript box[0] will invoke put(int i), not put(String s)
- put("0", newnode);
+ if (t != null) t.perform(b);
}
}
}
}
- // don't want to really cascade down to the box on this one
- if (name.equals("0")) return;
-
SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
if (gph != null) { gph.put(name, this, value); return; }
if (oldparent != null) { Box b = oldparent; MARK_FOR_REFLOW_b; }
// note that JavaScript box[0] will invoke put(int i), not put(String s)
- if (oldparent != null) oldparent.put("0", this);
+ if (oldparent != null) {
+ Trap t = (Trap)oldparent.get("childremoved", Trap.class);
+ if (t != null) t.perform(this);
+ }
}
/** returns our next sibling (parent[ourindex + 1]) */
return parent.getRoot();
}
+ public void recompute_font() {
+ if (text == null) { textwidth = textheight = 0; return; }
+ if (font == null) { /* FIXME */ }
+ long widthheight = Glyph.rasterizeGlyphs(font, fontsize, text, null, textcolor, 0, 0, 0, 0, 0, 0,
+ new Callback() { public Object call(Object arg) {
+ Box b = Box.this;
+ recompute_font();
+ MARK_FOR_REFLOW_b;
+ b.dirty();
+ return null;
+ } });
+ if (widthheight == -1) return;
+ textwidth = (int)((widthheight & 0xffff0000) >> 16);
+ textheight = (int)(widthheight & 0x0000ffff);
+ MARK_FOR_REFLOW_this;
+ }
+
- // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
+ // Trivial Helper Method s(should be inlined) /////////////////////////////////////////
static final int min(int a, int b) { if (a<b) return a; else return b; }
+ static final float min(float a, float b) { if (a<b) return a; else return b; }
static final double min(double a, double b) { if (a<b) return a; else return b; }
static final int max(int a, int b) { if (a>b) return a; else return b; }
+ static final float max(float a, float b) { if (a>b) return a; else return b; }
static final int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; }
static final int max(int a, int b, int c) { if (a>=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; }
static final int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; }
static {
specialBoxProperties.put("fill", new ColorBoxProperty() {
+ public void put(final Box b, final Object value) {
+ if (value == null || !(value instanceof Res)) super.put(b, value);
+ else Picture.fromRes((Res)value, new Callback() { public Object call(Object pic) {
+ if (pic == b.image) return null;
+ b.image = (Picture)pic;
+ b.minwidth = b.image.getWidth();
+ b.minheight = b.image.getHeight();
+ MARK_FOR_REFLOW_b;
+ b.dirty();
+ return null;
+ } });
+ }
public int getColor(Box b) { return b.fillcolor; }
public void putColor(Box b, int argb) { b.fillcolor = argb; }
});
String t = value == null ? "null" : value.toString();
if (t.equals(b.text)) return;
b.text = t;
- if (t == null) {
- 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.dirty();
+ b.recompute_font();
} });
specialBoxProperties.put("path", new SpecialBoxProperty() {
}
t = t.substring(t.indexOf(')') + 1).trim();
}
+ MARK_FOR_REFLOW_b;
b.dirty();
}
public Object get(Box b) { return b.transform.toString(); }
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() {
b.dirty();
} });
+ specialBoxProperties.put("align", new SpecialBoxProperty() {
+ public Object get(Box b) {
+ switch(b.flags & ALIGN_FLAGS) {
+ case (ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG): return "topleft";
+ case (ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG): return "bottomleft";
+ case (ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG): return "topright";
+ case (ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG): return "bottomright";
+ case ALIGN_TOP_FLAG: return "top";
+ case ALIGN_BOTTOM_FLAG: return "bottom";
+ case ALIGN_LEFT_FLAG: return "left";
+ case ALIGN_RIGHT_FLAG: return "right";
+ case 0: return "center";
+ default: throw new Error("invalid alignment flags: " + (b.flags & ALIGN_FLAGS));
+ }
+ }
+ public void put(Box b, Object value) {
+ b.flags &= ~ALIGN_FLAGS;
+ if (value == null || value.equals("center")) { b.flags &= ALIGN_FLAGS; }
+ else if (value.equals("topleft")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG; }
+ else if (value.equals("bottomleft")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG; }
+ else if (value.equals("topright")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG; }
+ else if (value.equals("bottomright")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG; }
+ else if (value.equals("top")) { b.flags |= ALIGN_TOP_FLAG; }
+ else if (value.equals("bottom")) { b.flags |= ALIGN_BOTTOM_FLAG; }
+ else if (value.equals("left")) { b.flags |= ALIGN_LEFT_FLAG; }
+ else if (value.equals("right")) { b.flags |= ALIGN_RIGHT_FLAG; }
+ else Log.logJS("invalid alignment specifier \"" + value + "\"");
+ MARK_FOR_REFLOW_b;
+ b.dirty();
+ } });
+
specialBoxProperties.put("thisbox", 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 & ABSOLUTE_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;
}
} });
});
//#end
- specialBoxProperties.put("tile", new SpecialBoxProperty() {
- public Object get(Box b) { return ((b.flags & TILE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
- public void put(Box b, Object value) {
- if (((b.flags & TILE_FLAG) != 0) == stob(value)) return;
- if (stob(value)) b.flags |= TILE_FLAG; else b.flags &= ~TILE_FLAG;
- b.dirty();
- } });
-
specialBoxProperties.put("noclip", new SpecialBoxProperty() {
public Object get(Box b) { return ((b.flags & NOCLIP_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
public void put(Box b, Object value) {
}
}});
- specialBoxProperties.put("absolute", new SpecialBoxProperty() {
- public Object get(Box b) { return ((b.flags & ABSOLUTE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
+ specialBoxProperties.put("packed", new SpecialBoxProperty() {
+ public Object get(Box b) { return ((b.flags & NOTPACKED_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
public void put(Box b, Object value) {
- if (stob(value) == ((b.flags & ABSOLUTE_FLAG) != 0)) return;
- if (stob(value)) b.flags |= ABSOLUTE_FLAG; else b.flags &= ~ABSOLUTE_FLAG;
- if ((b.flags & ABSOLUTE_FLAG) != 0) { b.x = 0; b.y = 0; }
+ if (stob(value) == ((b.flags & NOTPACKED_FLAG) == 0)) return;
+ if (!stob(value)) b.flags |= NOTPACKED_FLAG; else b.flags &= ~NOTPACKED_FLAG;
+ if ((b.flags & NOTPACKED_FLAG) != 0) { b.x = 0; b.y = 0; }
if (b.parent != null) MARK_FOR_REFLOW_b_parent;
} });
- specialBoxProperties.put("image", new SpecialBoxProperty() {
- /* FIXME
- public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); }
- */
- 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) {
- b.image = Picture.fromRes((Res)value);
- } else {
- // FIXME
- }
- b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
- b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
- MARK_FOR_REFLOW_b;
- b.dirty();
- }
- });
-
//#repeat globalx/globaly x/y
specialBoxProperties.put("globalx", new SpecialBoxProperty() {
public Object get(Box b) { return new Integer(b.parent == null || b.surface == null ? 0 : b.x); }
specialBoxProperties.put("PosChange", new SpecialBoxProperty());
specialBoxProperties.put("SizeChange", new SpecialBoxProperty());
- //#repeat hpad/vpad
- specialBoxProperties.put("hpad", new SpecialBoxProperty() {
- public Object get(Box b) {
- if (b.redirect == null) return new Integer(0);
- if (b.redirect != b) return get(b.redirect);
- return new Integer(b.hpad);
- }
- public void put(Box b, Object value) {
- if (b.redirect == null) return;
- if (b.redirect != b) { put(b.redirect, value); return; }
- int newval = stoi(value);
- if (newval == b.hpad) return;
- b.hpad = newval;
- MARK_FOR_REFLOW_b;
- }
- });
- //#end
-
//#repeat minwidth/minheight maxwidth/maxheight
specialBoxProperties.put("minwidth", new SpecialBoxProperty() {
public Object get(Box b) { return new Integer(b.minwidth); }
projects / org.ibex.core.git / blobdiff