X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=e34fe984f246e85f1a810651cb6db135f01b65d0;hb=b3611dccef8b70fc1229f259e3a9f9bdf1b2b8b4;hp=1fc2e82bb883fdca30c6a800b840f01665c7c713;hpb=6242c991f365dbd67eba62ecfa5df769a83fcbc6;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 1fc2e82..e34fe98 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -225,13 +225,6 @@ public final class Box extends JSObject { /** Holds four "strip images" -- 0=top, 1=bottom, 2=left, 3=right, 4=all */ Picture[] border = null; - /** - * The dirty() method walks up the tree, clipping the region being dirtied to each parent -- if this value is less than or - * equal to surface.dirtiedTimeStamp, it means that the entire screen region covered by this box has been dirtied, so dirty()'s on - * children can short-circuit. - */ - int dirtiedTimeStamp = 0; - /** true iff the box's background image should be tiled */ boolean tile = false; @@ -296,6 +289,9 @@ public final class Box extends JSObject { if (getParent() == null && surface != null && which == size) surface._setSize(axis == 0 ? newvalue : size(0), axis == 1 ? newvalue : size(1)); + if (getParent() == null && surface != null && (which == dmin || which == dmax)) + surface.setLimits(dmin(0), dmin(1), dmax(0), dmax(1)); + switch(which) { case dmin: if (dmin(axis) == newvalue) return; if (axis == 0) _dmin_0 = newvalue; else _dmin_1 = newvalue; break; case dmax: if (dmax(axis) == newvalue) return; if (axis == 0) _dmax_0 = newvalue; else _dmax_1 = newvalue; break; @@ -332,6 +328,9 @@ public final class Box extends JSObject { // if the pad changes, update cmin if (which == pad) sync_cmin_to_children(); + // needed in the shrink case, since dmin may have been the deciding factor in calculating cmin + if ((vshrink || hshrink) && (which == dmin || which == textdim || which == pad)) sync_cmin_to_children(); + // if the cmin changes, we need to be re-prerendered if (which == cmin) mark_for_prerender(); @@ -553,13 +552,11 @@ public final class Box extends JSObject { /** Adds the node's current actual geometry to the Surface's dirty list */ void dirty() { dirty(pos(0), pos(1), size(0), size(1)); - if (surface != null) dirtiedTimeStamp = surface.dirtiedTimeStamp + 1; } /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ - final void dirty(int x, int y, int w, int h) { + public final void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.getParent()) { - if (surface != null && cur.dirtiedTimeStamp > surface.dirtiedTimeStamp && cur.dirtiedTimeStamp < Integer.MAX_VALUE - 1) return; w = min(x + w, cur.pos(0) + cur.size(0)) - max(x, cur.pos(0)); h = min(y + h, cur.pos(1) + cur.size(1)) - max(y, cur.pos(1)); x = max(x, cur.pos(0)); @@ -699,6 +696,7 @@ public final class Box extends JSObject { 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); try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); InterpretedFunction f = (InterpretedFunction)t.f; @@ -817,7 +815,6 @@ public final class Box extends JSObject { /** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */ void render(int xIn, int yIn, int wIn, int hIn, DoubleBuffer buf) { - dirtiedTimeStamp = surface.dirtiedTimeStamp; if (surface.abort || invisible) return; // intersect the x,y,w,h rendering window with ourselves; quit if it's empty @@ -828,16 +825,16 @@ public final class Box extends JSObject { if (w <= 0 || h <= 0) return; if (border != null) renderBorder(x, y, w, h, buf); - if ((color & 0xFF000000) != 0x00000000 || getParent() == null) { int bw = border == null ? 0 : border[2].getWidth(); int bh = border == null ? 0 : border[0].getHeight(); + 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) - bh); buf.setClip(0, 0, buf.getWidth(), buf.getHeight()); - buf.fillRect(max(x, pos(0) + bw), - max(y, pos(1) + bh), - min(x + w, pos(0) + size(0) - bw), - min(y + h, pos(1) + size(1) - bh), - (color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray); + if (y2 - y1 > 0 && x2 - x1 > 0) + buf.fillRect(x1,y1,x2,y2,(color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray); } if (image != null) { @@ -865,7 +862,7 @@ public final class Box extends JSObject { 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])); + //if (Log.verbose) Log.log(this, "WARNING: (color == null && border != null) on box with border " + imageToNameMap.get(border[4])); // upper left corner buf.drawPicture(border[4], @@ -979,15 +976,15 @@ public final class Box extends JSObject { if (font.lastIndexOf('d') > i) { for(int j = pos(0) + pad(0); j < pos(0) + pad(0) + textdim(0); j += 2) - buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3, - j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1, + buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2, + j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1, textcolor); } else if (font.lastIndexOf('u') > i) { buf.fillRect(pos(0) + pad(0), - pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3, + pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2, pos(0) + pad(0) + textdim(0), - pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 3 + 1, + pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1, textcolor); } @@ -1011,7 +1008,7 @@ public final class Box extends JSObject { */ public void put(int i, Scriptable start, Object value) { if (value == null) { - if (i > 0 && i < numChildren()) getChild(i).remove(); + if (i >= 0 && i < numChildren()) getChild(i).remove(); return; } if (value instanceof RootProxy) { @@ -1089,6 +1086,7 @@ public final class Box extends JSObject { if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null); if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null); if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null); + if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null); // See if we're reading back the function value of a trap if (name.charAt(0) == '_') { @@ -1115,7 +1113,8 @@ public final class Box extends JSObject { if (traps != null && traps.get(name) != null) return true; if (name.charAt(0) == '_') return true; if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true; - if (name.equals("Function") || name.equals("Array") || name.equals("Object") || name.equals("TypeError")) return true; + if (name.equals("Function") || name.equals("Array") || name.equals("Object") || + name.equals("TypeError") || name.equals("ConversionError")) return true; return super.has(name, start); }