summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-11-22 12:33:49 +0000
committerManolo Gouy <Manolo>2011-11-22 12:33:49 +0000
commit1962c2b6edaedaaeb43f5428c22e1243ccf52d94 (patch)
tree884dd60d47e38a15fc7c0d00c38afce4d7aac360
parent12a0cb308ec838972c06b15c269cbb74b2b22a23 (diff)
Fix STR #2775. Under Mac OS, fixed some erroneous window move/resize.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9181 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index df07d9dae..943a45c3d 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -937,6 +937,7 @@ void fl_open_callback(void (*cb)(const char *)) {
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 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
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) {