Updated patch from upstream.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4818 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/fltk/src/Fl_cocoa.mm b/common/fltk/src/Fl_cocoa.mm
index 19a58acfb59bc3a037efa605477ad6377c1022ee..4168f26dd665faf5326c0dd344d1094463ba44df 100644 (file)
--- a/common/fltk/src/Fl_cocoa.mm
+++ b/common/fltk/src/Fl_cocoa.mm
@@ -1062,6 +1062,7 @@ extern "C" {
   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)([[nsw screen] frame].size.height - pt2.y));
   if ([nsw containsGLsubwindow] ) {
     [nsw display];// redraw window after moving if it contains OpenGL subwindows
@@ -2591,18 +2592,13 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
       dim.origin.y = [[(NSWindow*)i->xid screen] frame].size.height - (Y + H);
       dim.size.width = W;
       dim.size.height = H + bt;
-      [(NSWindow*)i->xid setFrame:dim display:YES];
+      [(NSWindow*)i->xid setFrame:dim display:YES]; // calls windowDidResize
     } else {
       NSPoint pt; 
       pt.x = X; 
       pt.y = [[(NSWindow*)i->xid screen] frame].size.height - (Y + h());
-      [(NSWindow*)i->xid setFrameOrigin:pt];
+      [(NSWindow*)i->xid setFrameOrigin:pt]; // calls windowDidMove
     }
-    // setFrame and setFrameOrigin are only requests to the system to
-    // do a resize or move. We will get callbacks later if the system allowed
-    // this, and possibly with adjusted values. We avoid processing until
-    // that happens (which usually happens directly as setFrame[Origin] is
-    // called).
     return;
   }
   resize_from_system = 0;