From f5e59aff466e7e647dde7c25c3dc995d4483d7d7 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 25 Nov 2011 09:18:28 +0000 Subject: [PATCH] Updated patch from upstream. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4818 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- common/fltk/src/Fl_cocoa.mm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common/fltk/src/Fl_cocoa.mm b/common/fltk/src/Fl_cocoa.mm index 19a58acf..4168f26d 100644 --- 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; -- 2.39.5