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;
(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);
}
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 {
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);
(HWND__*)NULL, (HMENU__*)NULL,
GetModuleHandle(NULL), (LPVOID)NULL);
+<<<<<<< Win32.cc
+ surface->hwnd = (jint)CreateWindow(wc.lpszClassName, TEXT(""),
+ (msg.wParam ? WS_NORMAL : WS_POPUP) | WS_SIZEBOX,
+ 200, 200, 100, 100,
+ (HWND__*)NULL, (HMENU__*)NULL,
+ GetModuleHandle(NULL), (LPVOID)NULL);
+=======
+>>>>>>> 1.27
SetFocus((HWND)surface->hwnd);
surface->hwndCreated->release();