X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=4a1c07aac417a6f2e01ac3045301f1241286bdec;hp=f18182cfc216d27cf6e1caa8e301d8b1b1ce3fc8;hb=5ef18e2b3993d3c515a0b51a1326b2ad11285f4a;hpb=d9fdc968988212807221d0d71d2fb6dc19cb87a3

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index f18182c..4a1c07a 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -473,42 +473,6 @@ public final class Box extends JS.Scope {
                 return redirect.callMethod(method, args, checkOnly);
             }
             return new Integer(b.getIndexInParent());
-
-        } else if ("apply".equals(method)) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.elementAt(0) instanceof Res) {
-                Res res = (Res)args.elementAt(0);
-                //                res = res.addExtension(".xwt");
-                Template t = Template.getTemplate(res);
-                if (ThreadMessage.suspendThread()) try {
-                    JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
-                    
-                    // FIXME!!! needs to be xwt.apply(template, box)
-                    t.apply(this, callback, 0, t.numUnits(), null);
-                } finally {
-                    ThreadMessage.resumeThread();
-                }
-            } else if (args.elementAt(0) instanceof String) {
-                String templatename = (String)args.elementAt(0);
-                // FIXME
-                Template t = Template.getTemplate(null);
-                if (t == null) {
-                    if (Log.on) Log.logJS(this, "template " + templatename + " not found");
-                } else {
-                    if (ThreadMessage.suspendThread()) try {
-                        JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
-                        // FIXME!!! needs to be xwt.apply(template, box)
-                        t.apply(this, callback, 0, t.numUnits(), null);
-                    } finally {
-                        ThreadMessage.resumeThread();
-                    }
-                }
-            } else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
-                JS s = (JS)args.elementAt(0);
-                Object[] keys = s.keys();
-                for(int j=0; j<keys.length; j++) put(keys[j].toString(), s.get(keys[j]));
-            }
-            return this;
         }
         return null;
     }
@@ -1132,8 +1096,8 @@ public final class Box extends JS.Scope {
                         } else {
                             // FIXME
                         }
-                        b.minwidth = b.image == null ? 0 : b.image.getWidth();
-                        b.minheight = b.image == null ? 0 : b.image.getHeight();
+                        b.minwidth = Math.min(b.maxwidth, Math.max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
+                        b.minheight = Math.min(b.maxheight, Math.max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
                         MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
@@ -1320,7 +1284,16 @@ public final class Box extends JS.Scope {
             //#end
 
             specialBoxProperties.put("redirect", new SpecialBoxProperty() {
-                    public void put(Box b, Object value) { }
+                    public void put(Box b, Object value) {
+                        if (b.redirect != b) Log.log(this, "cannot change the redirect of a box once it is set");
+                        else if (value == null) b.redirect = null;
+                        else {
+                            Box b2 = (Box)value;
+                            while(b2 != b && b2 != null) b2 = b2.parent;
+                            if (b2 == null) Log.log(this, "a box's redirect must be one of its descendants");
+                            b.redirect = (Box)value;
+                        }
+                    }
                     public Object get(Box b) {
                         if (b.redirect == null) return null;
                         if (b.redirect == b) return Boolean.TRUE;