2003/09/23 21:16:10

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

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 2c25b44..554b287 100644 (file)
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -1122,26 +1122,22 @@ public final class Box extends JS.Scope {
                     } });
         
             specialBoxProperties.put("image", new SpecialBoxProperty() {
-                    // FIXME
-                    /*
+                    /* FIXME
                     public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); }
+                    */
                     public void put(Box b, Object value) {
-                        if ((value == null && b.image == null) ||
-                            (value != null && b.image != null && value.equals(ImageDecoder.imageToNameMap.get(b.image)))) return;
-                        String s = value == null ? null : value.toString();
-                        if (s == null || s.equals("")) b.image = null;
-                        else {
-                            if ((b.image = ImageDecoder.getPicture(s)) == null) {
-                                if (Log.on) Log.logJS(Box.class, "unable to load image " + s);
-                            } else {
-                                b.minwidth = b.image.getWidth();
-                                b.minheight = b.image.getHeight();
-                                MARK_FOR_REFLOW_b;
-                            }
+                        if (value == null) {
+                            b.image = null;
+                        } else if (value instanceof Res) {
+                            b.image = Picture.fromRes((Res)value);
+                        } else {
+                            // FIXME
                         }
+                        b.minwidth = b.image == null ? 0 : b.image.getWidth();
+                        b.minheight = b.image == null ? 0 : b.image.getHeight();
+                        MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
-                    */
                 });
 
             //#repeat globalx/globaly x/y