X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;fp=src%2Forg%2Fxwt%2FBox.java;h=e8170cb12ea0558622232387671708d7332c5a72;hb=230cb077accfdde49592c27f7c5aa09c0753e7ab;hp=e00ecf78af3b5ed7688fe6772c54e8b434c88974;hpb=9b9ac0a0bac4f70cfcc2af30babd4598627490c0;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index e00ecf7..e8170cb 100644
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -257,7 +257,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         if (x != this.x || y != this.y || width != this.width || height != this.height) {
             boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
             boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
-            do {
+            //do {
                 int thisx = parent == null ? 0 : this.x;
                 int thisy = parent == null ? 0 : this.y;
 
@@ -280,8 +280,8 @@ public final class Box extends JSScope implements Scheduler.Task {
                 (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
                 this.width = width; this.height = height; this.x = x; this.y = y;
                 dirty();
-            } while (false);
-            this.width = width; this.height = height; this.x = x; this.y = y;
+                //} while (false);
+                //this.width = width; this.height = height; this.x = x; this.y = y;
             if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
             if (poschange)  putAndTriggerTrapsAndCatchExceptions("PosChange", T);
         }
@@ -322,8 +322,8 @@ public final class Box extends JSScope implements Scheduler.Task {
             if (!child.test(PACKED)) {
                 child_x = child.x;
                 child_y = child.y;
-                child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child.x);
-                child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child.y);
+                child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child_x);
+                child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child_y);
                 child_width = max(child.minwidth, child_width);
                 child_height = max(child.minheight, child_height);
             } else {
@@ -543,8 +543,8 @@ public final class Box extends JSScope implements Scheduler.Task {
             MARK_RESIZE;
             dirty();
         case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
-        case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
-        case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
+        case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
+        case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
         case "titlebar":
             if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value));
             super.put(name,value);