disabled clipping code again; it is getting stuck in loops

[org.ibex.core.git] / src / org / ibex / core / Box.java

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index ffec434..396a2b6 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -106,7 +106,7 @@ public final class Box extends JS.Obj implements Callable, Mesh.Chain {
     public void dirty() { if (path==null) dirty(0, 0, contentwidth, contentheight); else dirty(path); }
     public void dirty(int x, int y, int w, int h) { }
     public void dirty(Path p) {
-        Affine a = transform;
+        Affine a = transform.copy();
         for(Box cur = this; cur != null; cur = cur.parent) a.premultiply(cur.transform);
         long hbounds = p.horizontalBounds(a);
         long vbounds = p.verticalBounds(a);
@@ -247,10 +247,13 @@ public final class Box extends JS.Obj implements Callable, Mesh.Chain {
             return;
         }
 
-        if (clipFrom != null) clipFrom.subtract(mesh, clipa);
-        Mesh mesh = treeSize() > 0 ? this.mesh.copy() : this.mesh;
-        for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, mesh, Affine.identity());
+        // FIXME: mesh clipping code has been getting stuck in loops; to see this,
+        //        uncomment the next two lines and swap the order of the last two lines.
+
+        //if (clipFrom != null) clipFrom.subtract(mesh, clipa);
+        //Mesh mesh = treeSize() > 0 ? this.mesh.copy() : this.mesh;
         mesh.fill(buf, a, null, fillcolor, true);
+        for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, mesh, Affine.identity());
     }
     
     // Methods to implement org.ibex.js.JS //////////////////////////////////////