X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=4cefc9e1937ab5189471334c921e96a8d4b5f431;hb=3a6aa10148124e4d8bbbd79ba1691365155cc857;hp=17283f6a3d640b1ed10027f8fc53376bf702481c;hpb=14986ab4361676324195e126f2de095a169a1aa2;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 17283f6..4cefc9e 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -257,15 +257,6 @@ public final class Box extends JSObject { public Hash traps = null; - // Vector Support ///////////////////////////////////////////////////////////////////// - - /** The SVG path for this node */ - public String path = null; - - /** The affine multiplied by the CTM *before* this element and its children are processed */ - public SVG.Affine transform = null; - - // Instance Data: IndexOf //////////////////////////////////////////////////////////// /** The indexof() Function; created lazily */ @@ -867,8 +858,7 @@ public final class Box extends JSObject { // Rendering Pipeline ///////////////////////////////////////////////////////////////////// /** 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) { render(xIn, yIn, wIn, hIn, buf, null); } - void render(int xIn, int yIn, int wIn, int hIn, DoubleBuffer buf, SVG.Affine ctm) { + void render(int xIn, int yIn, int wIn, int hIn, DoubleBuffer buf) { if (surface.abort || invisible) return; // intersect the x,y,w,h rendering window with ourselves; quit if it's empty @@ -895,24 +885,6 @@ public final class Box extends JSObject { else renderStretchedImage(x, y, w, h, buf); } - // FIXME: this should go at the top of this method - SVG.Affine ctm_; - if (transform != null) { - if (ctm == null) ctm = SVG.Affine.identity(); - ctm_ = ctm.copy(); - ctm_.multiply(transform); - } else { - ctm_ = ctm; - } - - if (path != null) { - SVG.VP vp = SVG.VP.fromString(path); - if (ctm_ != null) vp.multiply(ctm_); - vp.sort(); - vp.fill(buf, null, 0xFFFF0000, null); - vp.stroke(buf, 100, textcolor, false); - } - if (text != null && !text.equals("")) renderText(x, y, w, h, buf); // now subtract the pad region from the clip region before proceeding @@ -922,7 +894,7 @@ public final class Box extends JSObject { int h2 = min(y + h, pos(1) + size(1) - pad(1)) - y2; for(Box b = getChild(0); b != null; b = b.nextSibling()) - b.render(x2, y2, w2, h2, buf, ctm_); + b.render(x2, y2, w2, h2, buf); } private void renderBorder(int x, int y, int w, int h, DoubleBuffer buf) {