move JS's Hashtable to JS.O

[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 629b263..bb8a27b 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -232,7 +232,7 @@ public final class Box extends JSScope implements Task {
     
     void resize(int x, int y, int width, int height) {
         if (x == this.x && y == this.y && width == this.width && height == this.height) return;
-        boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
+        boolean sizechange = (this.width != width || this.height != height) && hasTrap("SizeChange");
         int thisx = parent == null ? 0 : this.x;
         int thisy = parent == null ? 0 : this.y;
         Box who = (parent == null ? this : parent);
@@ -448,9 +448,9 @@ public final class Box extends JSScope implements Task {
 
                 case "distanceto":
                     Box b = (Box)a0;
-                    JS ret = new JS();
-                    ret.put("x", N(localToGlobalX(0) - b.localToGlobalX(0)));
-                    ret.put("y", N(localToGlobalY(0) - b.localToGlobalY(0)));
+                    JS ret = new JS.O();
+                    ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0)));
+                    ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0)));
                     return ret;
 
                 //#end
@@ -468,7 +468,13 @@ public final class Box extends JSScope implements Task {
         case "indexof": return METHOD;
         case "distanceto": return METHOD;
         case "text": return text;
-        case "path": throw new JSExn("cannot read from the path property");
+        case "path": 
+            if (path != null) return path.toString();
+            if (text == null) return null;
+            if (font == null) return null;
+            String ret = "";
+            for(int i=0; i<text.length(); i++) ret += font.glyphs[text.charAt(i)].path;
+            return ret;
         case "fill": return Color.colorToString(fillcolor);
         case "strokecolor": return Color.colorToString(strokecolor);
         case "textcolor": return Color.colorToString(strokecolor);
@@ -512,7 +518,7 @@ public final class Box extends JSScope implements Task {
         throw new Error("unreachable"); // unreachable
     }
 
-    private class Mouse extends JS.Cloneable {
+    private class Mouse extends JS implements JS.Cloneable {
         public Object get(Object key) {
             //#switch(key)
             case "x": return N(globalToLocalX(getSurface()._mousex));
@@ -551,7 +557,7 @@ public final class Box extends JSScope implements Task {
         case "shrink":      CHECKSET_FLAG(HSHRINK | VSHRINK); RECONSTRAIN();
         case "hshrink":     CHECKSET_FLAG(HSHRINK); RECONSTRAIN();
         case "vshrink":     CHECKSET_FLAG(VSHRINK); RECONSTRAIN();
-        case "path":        path = Path.parse(toString(value)); dirty();
+        case "path":        path = Path.parse(toString(value)); RECONSTRAIN(); dirty();
         case "width":       setWidth(toInt(value), toInt(value));
         case "height":      setHeight(toInt(value), toInt(value));
         case "maxwidth":    setWidth(minwidth, toInt(value));