Author: manolo
Date: 2011-11-22 04:33:49 -0800 (Tue, 22 Nov 2011)
New Revision: 9181
Log:
Fix STR #2775. Under Mac OS, fixed some erroneous window move/resize.
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2011-11-16 11:56:00 UTC (rev 9180)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2011-11-22 12:33:49 UTC (rev 9181)
@@ -937,6 +937,7 @@
pt.y = [[nsw contentView] frame].size.height;
pt2 = [nsw convertBaseToScreen:pt];
update_e_xy_and_e_xy_root(nsw);
+ resize_from_system = window;
window->position((int)pt2.x, (int)(main_screen_height - pt2.y));
if ([nsw containsGLsubwindow] ) {
[nsw display];// redraw window after moving if it contains OpenGL
subwindows
@@ -2237,13 +2238,14 @@
dim.origin.y = main_screen_height - (Y + H);
dim.size.width = W;
dim.size.height = H + bt;
- [i->xid setFrame:dim display:YES];
+ [i->xid setFrame:dim display:YES]; // calls windowDidResize
} else {
NSPoint pt;
pt.x = X;
pt.y = main_screen_height - (Y + h());
- [i->xid setFrameOrigin:pt];
+ [i->xid setFrameOrigin:pt]; // calls windowDidMove
}
+ return;
}
resize_from_system = 0;
if (is_a_resize) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
