From: megacz Date: Fri, 30 Jan 2004 07:42:27 +0000 (+0000) Subject: 2003/11/30 02:06:31 X-Git-Tag: RC3~293 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=4bc540de0c5679607067b4598e99acee2cc66356 2003/11/30 02:06:31 darcs-hash:20040130074227-2ba56-37df70f34b1771e1ed2442e6e11bb8f3b489b529.gz --- diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 3da445a..8c36f81 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -461,8 +461,8 @@ public final class Box extends JSScope { case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once"); case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty(); case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty(); - case "x": if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); - case "y": 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; 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 "KeyPressed": return; // prevent stuff from hitting the Hash case "KeyReleased": return; // prevent stuff from hitting the Hash case "PosChange": return; // prevent stuff from hitting the Hash