@@ -82,7 +82,7 @@ import org.mozilla.javascript.*; * uses x1,y1,x2,y2 tuples. *
*/ -public final class Box extends JSObject { +public final class Box extends JS.Scope { // Static Data ////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ public final class Box extends JSObject { static Hash imageToNameMap = new Hash(); /** the empty object, used for get-traps */ - private static Object[] emptyobj = new Object[] { }; + private static JS.Array emptyobj = new JS.Array(); // Instance Data: Templates //////////////////////////////////////////////////////// @@ -122,63 +122,63 @@ public final class Box extends JSObject { /** The maximum defined width and height of this box */ public static final int dmax = 0; - private short _dmax_0 = 0; - private short _dmax_1 = 0; - public final short dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; } + private int _dmax_0 = 0; + private int _dmax_1 = 0; + public final int dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; } /** The minimum defined width and height of this box */ public static final int dmin = 1; - private short _dmin_0 = 0; - private short _dmin_1 = 0; - public final short dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; } + private int _dmin_0 = 0; + private int _dmin_1 = 0; + public final int dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; } /** The minimum calculated width and height of this box -- unlike dmin, this takes childrens' sizes into account */ public static final int cmin = 2; - private short _cmin_0 = 0; - private short _cmin_1 = 0; - public final short cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; } + private int _cmin_0 = 0; + private int _cmin_1 = 0; + public final int cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; } /** The position of this box, relitave to the parent */ public static final int abs = 3; - private short _abs_0 = 0; - private short _abs_1 = 0; - public final short abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; } + private int _abs_0 = 0; + private int _abs_1 = 0; + public final int abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; } /** The absolute position of this box (ie relitave to the root); set by the parent */ public static final int pos = 4; - private short _pos_0 = 0; - private short _pos_1 = 0; - public final short pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; } + private int _pos_0 = 0; + private int _pos_1 = 0; + public final int pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; } /** The actual size of this box; set by the parent. */ public static final int size = 5; - short _size_0 = 0; - short _size_1 = 0; - public final short size(int axis) { return axis == 0 ? _size_0 : _size_1; } + int _size_0 = 0; + int _size_1 = 0; + public final int size(int axis) { return axis == 0 ? _size_0 : _size_1; } /** The old actual absolute position of this box (ie relitave to the root) */ public static final int oldpos = 6; - private short _oldpos_0 = 0; - private short _oldpos_1 = 0; - public final short oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; } + private int _oldpos_0 = 0; + private int _oldpos_1 = 0; + public final int oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; } /** The old actual size of this box */ public static final int oldsize = 7; - private short _oldsize_0 = 0; - private short _oldsize_1 = 0; - public final short oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; } + private int _oldsize_0 = 0; + private int _oldsize_1 = 0; + public final int oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; } /** The padding along each edge for this box */ public static final int pad = 8; - private short _pad_0 = 0; - private short _pad_1 = 0; - public final short pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; } + private int _pad_0 = 0; + private int _pad_1 = 0; + public final int pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; } /** The dimensions of the text in this box */ public static final int textdim = 9; - private short _textdim_0 = 0; - private short _textdim_1 = 0; - public final short textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; } + private int _textdim_0 = 0; + private int _textdim_1 = 0; + public final int textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; } // Instance Data ///////////////////////////////////////////////////////////////// @@ -189,8 +189,11 @@ public final class Box extends JSObject { /** If redirect is enabled, this holds the Box redirected to */ Box redirect = this; - /** the Box's font -- you must call textupdate() after changing this */ - String font = Platform.getDefaultFont(); + /** the Box's font, null inherits from parent -- you must call textupdate() after changing this */ + String font = null; + + /** if font == null, this might be a cached copy of the inherited ancestor font */ + String cachedFont = null; /** The surface for us to render on; null if none; INVARIANT: surface == getParent().surface */ Surface surface = null; @@ -234,6 +237,9 @@ public final class Box extends JSObject { /** If true, the Box will force its own size to the natural size of its background image */ boolean sizetoimage = false; + /** If true and tile is false, the background of this image will never be stretched */ + boolean fixedaspect = false; + /** If true, the box will shrink to the smallest vertical size possible */ boolean vshrink = false; @@ -257,22 +263,18 @@ public final class Box extends JSObject { // Instance Data: IndexOf //////////////////////////////////////////////////////////// /** The indexof() Function; created lazily */ - public Function indexof = null; - public Function indexof() { - if (indexof == null) indexof = new IndexOf(); - return indexof; - } + public JS.Callable indexof = null; + public JS.Callable indexof() { if (indexof == null) indexof = new IndexOf(); return indexof; } /** a trivial private class to serve as the box.indexof function object */ - private class IndexOf extends JSObject implements Function { + private class IndexOf extends JS.Callable { public IndexOf() { this.setSeal(true); } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - public Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException { - if (args == null || args.length != 1 || args[0] == null || !(args[0] instanceof Box)) return new Integer(-1); - Box b = (Box)args[0]; + public Object call(JS.Array args) throws JS.Exn { + if (args.length() != 1 || args.elementAt(0) == null || !(args.elementAt(0) instanceof Box)) return new Integer(-1); + Box b = (Box)args.elementAt(0); if (b.getParent() != Box.this) { if (redirect == null || redirect == Box.this) return new Integer(-1); - return Box.this.redirect.indexof().call(cx, scope, thisObj, args); + return Box.this.redirect.indexof().call(args); } return new Integer(b.getIndexInParent()); } @@ -282,8 +284,7 @@ public final class Box extends JSObject { // Methods which enforce/preserve invariants //////////////////////////////////////////// /** This method MUST be used to change geometry values -- it ensures that certain invariants are preserved. */ - public final void set(int which, int axis, int newvalue) { set(which, axis, (short)newvalue); } - public final void set(int which, int axis, short newvalue) { + public final void set(int which, int axis, int newvalue) { // if this Box is the root of the Surface, notify the Surface of size changes if (getParent() == null && surface != null && which == size) @@ -310,16 +311,11 @@ public final class Box extends JSObject { if (which == dmin) set(size, axis, max(size(axis), newvalue)); if (which == dmax) set(size, axis, min(size(axis), newvalue)); - // keep obedience to shrink directives - if (which == cmin || which == textdim || which == pad || which == dmin) - if ((hshrink && axis == 0) || (vshrink && axis == 1)) - set(dmax, axis, max(cmin(axis), (textdim(axis) + 2 * pad(axis)), dmin(axis))); - // keep cmin in line with dmin/dmax/textdim if (which == dmax || which == dmin || which == textdim || which == pad || which == cmin) set(cmin, axis, max( - min(cmin(axis), dmax(axis)), + min(dmax(axis), cmin(axis)), dmin(axis), min(dmax(axis), textdim(axis) + 2 * pad(axis)) ) @@ -355,13 +351,13 @@ public final class Box extends JSObject { /** Ensures that cmin is in sync with the cmin's of our children. This should be called whenever a child is added or * removed, as well as when our pad is changed. */ final void sync_cmin_to_children() { - short co = (short)(2 * pad(o)); - short cxo = (short)(2 * pad(xo)); + int co = (int)(2 * pad(o)); + int cxo = (int)(2 * pad(xo)); for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { if (bt.invisible || bt.absolute) continue; co += bt.cmin(o); - cxo = (short)max(bt.cmin(xo) + 2 * pad(xo), cxo); + cxo = (int)max(bt.cmin(xo) + 2 * pad(xo), cxo); } set(cmin, o, co); @@ -376,16 +372,34 @@ public final class Box extends JSObject { set(dmin, 1, (image == null ? 0 : image.getHeight()) + (border == null ? 0 : border[0].getHeight()) * 2); } + /** returns the actual font that should be used to render this box */ + private String font() { + if (font != null) return font; + if (font == null && cachedFont != null) return cachedFont; + if (getParent() != null) return cachedFont = getParent().font(); + return cachedFont = Platform.getDefaultFont(); + } + + /** this must be called when a box's font changes */ + void fontChanged() { + textupdate(); + for(Box b = getChild(0); b != null; b = b.nextSibling()) + if (b.font == null) { + b.cachedFont = font(); + b.fontChanged(); + } + } + /** This must be called when font or text is changed */ void textupdate() { if (text.equals("")) { set(textdim, 0, 0); set(textdim, 1, 0); } else { - XWF xwf = XWF.getXWF(font); + XWF xwf = XWF.getXWF(font()); if (xwf == null) { - set(textdim, 0, Platform.stringWidth(font, text)); - set(textdim, 1, (Platform.getMaxAscent(font) + Platform.getMaxDescent(font))); + set(textdim, 0, Platform.stringWidth(font(), text)); + set(textdim, 1, (Platform.getMaxAscent(font()) + Platform.getMaxDescent(font()))); } else { set(textdim, 0, xwf.stringWidth(text)); set(textdim, 1, (xwf.getMaxAscent() + xwf.getMaxDescent())); @@ -410,29 +424,63 @@ public final class Box extends JSObject { } /** loads the image described by string str, possibly blocking for a network load */ - private static ImageDecoder getImage(String str) { - ImageDecoder ret = null; - boolean ispng = false; + static ImageDecoder getImage(String str, final JS.Callable callback) { if (str.indexOf(':') == -1) { String s = str; byte[] b = Resources.getResource(Resources.resolve(s + ".png", null)); - if (b == null) return null; - return PNG.decode(new ByteArrayInputStream(b), str); + if (b != null) return PNG.decode(new ByteArrayInputStream(b), str); + b = Resources.getResource(Resources.resolve(s + ".jpeg", null)); + if (b != null) return Platform.decodeJPEG(new ByteArrayInputStream(b), str); + return null; } else { - Thread thread = Thread.currentThread(); + java.lang.Thread thread = java.lang.Thread.currentThread(); if (!(thread instanceof ThreadMessage)) { if (Log.on) Log.log(Box.class, "HTTP images can not be loaded from the foreground thread"); return null; } + // FIXME: use primitives here ThreadMessage mythread = (ThreadMessage)thread; - mythread.setPriority(Thread.MIN_PRIORITY); + mythread.setPriority(java.lang.Thread.MIN_PRIORITY); mythread.done.release(); try { - if (str.endsWith(".png")) ret = PNG.decode(Platform.urlToInputStream(new URL(str)), str); - else ret = GIF.decode(Platform.urlToInputStream(new URL(str)), str); - return ret; + HTTP http = new HTTP(str); + final HTTP.HTTPInputStream in = http.GET(); + final int contentLength = in.getContentLength(); + InputStream is = new FilterInputStream(in) { + int bytesDownloaded = 0; + boolean clear = true; + public int read() throws IOException { + bytesDownloaded++; + return super.read(); + } + public int read(byte[] b, int off, int len) throws IOException { + int ret = super.read(b, off, len); + if (ret != -1) bytesDownloaded += ret; + if (clear && callback != null) { + clear = false; + ThreadMessage.newthread(new JS.Callable() { + public Object call(JS.Array args_) throws JS.Exn { + try { + JS.Array args = new JS.Array(); + args.addElement(new Double(bytesDownloaded)); + args.addElement(new Double(contentLength)); + callback.call(args); + } finally { + clear = true; + } + return null; + } + }); + } + return ret; + } + }; + + if (str.endsWith(".gif")) return GIF.decode(is, str); + else if (str.endsWith(".jpeg") || str.endsWith(".jpg")) return Platform.decodeJPEG(is, str); + else return PNG.decode(is, str); } catch (IOException e) { if (Log.on) Log.log(Box.class, "error while trying to load an image from " + str); @@ -441,7 +489,7 @@ public final class Box extends JSObject { } finally { MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); + mythread.setPriority(java.lang.Thread.NORM_PRIORITY); mythread.go.block(); } } @@ -452,7 +500,7 @@ public final class Box extends JSObject { Picture ret = null; ret = (Picture)pictureCache.get(os); if (ret != null) return ret; - ImageDecoder id = getImage(os); + ImageDecoder id = getImage(os, null); if (id == null) return null; ret = Platform.createPicture(id); pictureCache.put(os, ret); @@ -470,8 +518,7 @@ public final class Box extends JSObject { } else { image = getPicture(s); if (image == null) { - if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.logJS(Box.class, "unable to load image " + s); return; } if (sizetoimage) syncSizeToImage(); @@ -490,10 +537,9 @@ public final class Box extends JSObject { } else { border = (Picture[])bordercache.get(s); if (border == null) { - ImageDecoder id = getImage(s); + ImageDecoder id = getImage(s, null); if (id == null) { - if (Log.on) Log.log(this, "unable to load border image " + s + " at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.logJS(this, "unable to load border image " + s); return; } int[] data = id.getData(); @@ -538,21 +584,10 @@ public final class Box extends JSObject { } /** returns true if the property has a trap on it */ - boolean is_trapped(String property) { - if (traps == null) { - return false; - } else { - Object gc = traps.get(property); - return (gc != null && - !(gc instanceof org.mozilla.javascript.Undefined) && - gc != org.mozilla.javascript.Scriptable.NOT_FOUND); - } - } + boolean is_trapped(String property) { return traps != null && traps.get(property) != null; } /** Adds the node's current actual geometry to the Surface's dirty list */ - void dirty() { - dirty(pos(0), pos(1), size(0), size(1)); - } + void dirty() { dirty(pos(0), pos(1), size(0), size(1)); } /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ public final void dirty(int x, int y, int w, int h) { @@ -582,9 +617,9 @@ public final class Box extends JSObject { if (!wasinside && !isinside) return; - if (!wasinside && isinside && is_trapped("Enter")) put("Enter", null, this); - else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", null, this); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", null, this); + if (!wasinside && isinside && is_trapped("Enter")) put("Enter", this); + else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", this); + else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", this); if (isinside && cursor != null && surface != null) surface.cursor = cursor; @@ -599,26 +634,31 @@ public final class Box extends JSObject { } /** creates a new box from an anonymous template; ids is passed through to Template.apply() */ - Box(Template anonymous, Vec pboxes, Vec ptemplates) { - super(true); - set(dmax, 0, Short.MAX_VALUE); - set(dmax, 1, Short.MAX_VALUE); + Box(Template anonymous, Vec pboxes, Vec ptemplates, JS.Callable callback, int numerator, int denominator) { + super(null); + set(dmax, 0, Integer.MAX_VALUE); + set(dmax, 1, Integer.MAX_VALUE); template = anonymous; - template.apply(this, pboxes, ptemplates); + template.apply(this, pboxes, ptemplates, callback, numerator, denominator); templatename = null; importlist = null; } /** creates a new box from an unresolved templatename and an importlist; use "box" for an untemplatized box */ - public Box(String templatename, String[] importlist) { - super(true); - set(dmax, 0, Short.MAX_VALUE); - set(dmax, 1, Short.MAX_VALUE); + public Box(String templatename, String[] importlist) { this(templatename, importlist, null); } + public Box(String templatename, String[] importlist, JS.Callable callback) { + super(null); + set(dmax, 0, Integer.MAX_VALUE); + set(dmax, 1, Integer.MAX_VALUE); this.importlist = importlist; - template = "box".equals(templatename) ? null : Template.getTemplate(templatename, importlist); - this.templatename = templatename; + if (!"box".equals(templatename)) { + template = Template.getTemplate(templatename, importlist); + if (template == null) + if (Log.on) Log.log(this, "couldn't find template \"" + templatename + "\""); + } if (template != null) { - template.apply(this, null, null); + this.templatename = templatename; + template.apply(this, null, null, callback, 0, template.numUnits()); if (redirect == this && !"self".equals(template.redirect)) redirect = null; } } @@ -629,6 +669,8 @@ public final class Box extends JSObject { /** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */ void prerender() { + if (invisible) return; + if (getParent() == null) { set(pos, 0, 0); set(pos, 1, 0); @@ -660,20 +702,21 @@ public final class Box extends JSObject { // FASTPATH: if we haven't moved position (just changed size), and we're not a stretched image: if (oldpos(0) == pos(0) && oldpos(1) == pos(1) && (image == null || tile)) { - - int bw = border == null ? 0 : border[2].getWidth(); - int bh = border == null ? 0 : border[0].getHeight(); - + + // we use the max(border, pad) since because of the pad we might be revealing an abs-pos child + int bw = max(border == null ? 0 : border[2].getWidth(), pad(0)); + int bh = max(border == null ? 0 : border[0].getHeight(), pad(1)); + // dirty only the *change* in the area we cover, both on ourselves and on our parent for(Box cur = this; cur != null && (cur == this || cur == this.getParent()); cur = cur.getParent()) { cur.dirty(pos(0) + min(oldsize(0) - bw, size(0) - bw), pos(1), - Math.abs(oldsize(0) - size(0)) + bw, + java.lang.Math.abs(oldsize(0) - size(0)) + bw, max(oldsize(1), size(1))); cur.dirty(pos(0), pos(1) + min(oldsize(1) - bh, size(1) - bh), max(oldsize(0), size(0)), - Math.abs(oldsize(1) - size(1)) + bh); + java.lang.Math.abs(oldsize(1) - size(1)) + bh); } // SLOWPATH: dirty ourselves, as well as our former position on our parent @@ -693,22 +736,26 @@ public final class Box extends JSObject { set(oldpos, 0, pos(0)); set(oldpos, 1, pos(1)); - if (sizechange || poschange) - if (surface.sizePosChangesSinceLastRender++ > 500) { - if (Log.on) Log.log(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); - if (Log.on) Log.log(this, " interpreter is at " + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (!sizechange && !poschange) return; + + if (++surface.sizePosChangesSinceLastRender >= 500) { + if (surface.sizePosChangesSinceLastRender == 500) { + if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); + /* try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); - InterpretedFunction f = (InterpretedFunction)t.f; + InterpretedJS.Callable f = (InterpretedJS.Callable)t.f; if (Log.on) Log.log(this, "Current trap is at " + f.getSourceName() + ":" + f.getLineNumbers()[0]); } catch (Throwable t) { } + */ + } + } else { + if (sizechange) put("SizeChange", Boolean.TRUE); + if (poschange) put("PosChange", Boolean.TRUE); + if (sizechange || poschange) { + surface.abort = true; + return; } - - if (sizechange) put("SizeChange", null, Boolean.TRUE); - if (poschange) put("PosChange", null, Boolean.TRUE); - if (sizechange || poschange) { - surface.abort = true; - return; } } @@ -720,8 +767,8 @@ public final class Box extends JSObject { for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { if (bt.invisible) continue; if (bt.absolute) { - bt.set(size, o, max(bt.cmin(o), min(size(o) - bt.abs(o) - pad(o), bt.dmax(o)))); - bt.set(size, xo, max(bt.cmin(xo), min(size(xo) - bt.abs(xo) - pad(xo), bt.dmax(xo)))); + bt.set(size, 0, bt.hshrink ? bt.cmin(0) : max(bt.cmin(0), min(size(0) - bt.abs(0) - pad(0), bt.dmax(0)))); + bt.set(size, 1, bt.vshrink ? bt.cmin(1) : max(bt.cmin(1), min(size(1) - bt.abs(1) - pad(1), bt.dmax(1)))); } else if (xo == 0 && bt.hshrink || xo == 1 && bt.vshrink) { bt.set(size, xo, bt.cmin(xo)); } else { @@ -756,15 +803,16 @@ public final class Box extends JSObject { for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { if (bt.absolute || bt.invisible) continue; - bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, bt.dmax(o))); + int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); + bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, btmax)); total += bt.size(o); if (factor * bt.flex < bt.cmin(o) && bt.size(o) == bt.cmin(o)) { nextjoint = min(nextjoint, divide_round_up(bt.cmin(o), bt.flex)); - } else if (bt.size(o) < bt.dmax(o)) { + } else if (bt.size(o) < btmax) { remaining_flex += bt.flex; - nextjoint = min(nextjoint, divide_round_up(bt.dmax(o), bt.flex)); + nextjoint = min(nextjoint, divide_round_up(btmax, bt.flex)); } } @@ -781,10 +829,11 @@ public final class Box extends JSObject { // arbitrarily distribute out any leftovers resulting from rounding errors int last = 0; - while(goal > total && total != last) { + while(goal != total && total != last) { last = total; for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) { - int newsize = bound(bt.cmin(o), bt.size(o) + 1, bt.dmax(o)); + int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o); + int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), btmax); total += newsize - bt.size(o); bt.set(size, o, newsize); } @@ -831,8 +880,7 @@ public final class Box extends JSObject { int x1 = max(x, pos(0) + bw); int y1 = max(y, pos(1) + bh); int x2 = min(x + w, pos(0) + size(0) - bw); - int y2 = min(y + h, pos(1) + size(1) - 2); - buf.setClip(0, 0, buf.getWidth(), buf.getHeight()); + int y2 = min(y + h, pos(1) + size(1) - bh); if (y2 - y1 > 0 && x2 - x1 > 0) buf.fillRect(x1,y1,x2,y2,(color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray); } @@ -860,7 +908,6 @@ public final class Box extends JSObject { buf.setClip(x, y, w + x, h + y); if ((color & 0xFF000000) != 0xFF000000) { - // if the color is null, we have to be very careful about drawing the corners //if (Log.verbose) Log.log(this, "WARNING: (color == null && border != null) on box with border " + imageToNameMap.get(border[4])); @@ -917,11 +964,28 @@ public final class Box extends JSObject { buf.setClip(x, y, w + x, h + y); int bw = border == null ? 0 : border[4].getHeight(); int bh = border == null ? 0 : border[4].getWidth(); + + int width = pos(0) + size(0) - bw / 2 - pos(0) + bw / 2; + int height = pos(1) + size(1) - bh / 2 - pos(1) + bh / 2; + + if (fixedaspect) { + int hstretch = width / image.getWidth(); + if (hstretch == 0) hstretch = -1 * image.getWidth() / width; + int vstretch = height / image.getHeight(); + if (vstretch == 0) vstretch = -1 * image.getHeight() / height; + + if (hstretch < vstretch) { + height = image.getHeight() * width / image.getWidth(); + } else { + width = image.getWidth() * height / image.getHeight(); + } + } + buf.drawPicture(image, pos(0) + bw / 2, pos(1) + bh / 2, - pos(0) + size(0) - bw / 2, - pos(1) + size(1) - bh / 2, + pos(0) + bw / 2 + width, + pos(1) + bh / 2 + height, 0, 0, image.getWidth(), image.getHeight()); buf.setClip(0, 0, buf.getWidth(), buf.getHeight()); } @@ -957,34 +1021,34 @@ public final class Box extends JSObject { if ((textcolor & 0xFF000000) == 0x00000000) return; buf.setClip(x, y, w + x, h + y); - XWF xwf = XWF.getXWF(font); + XWF xwf = XWF.getXWF(font()); if (xwf != null) { xwf.drawString(buf, text, pos(0) + pad(0), pos(1) + pad(1) + xwf.getMaxAscent() - 1, textcolor); } else { - buf.drawString(font, text, + buf.drawString(font(), text, pos(0) + pad(0), - pos(1) + pad(1) + Platform.getMaxAscent(font) - 1, + pos(1) + pad(1) + Platform.getMaxAscent(font()) - 1, textcolor); } buf.setClip(0, 0, buf.getWidth(), buf.getHeight()); - int i=0; while(i