aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2011-11-21 14:04:29 +0000
committerPierre Ossman <ossman@cendio.se>2011-11-21 14:04:29 +0000
commitdd321adab0a9797de656121ffdee4417129ce6a7 (patch)
treeca0309e309027cb9b3f31e3ee708129a15fba4e6
parent29e4a1652eb635cc27b0d0f2fbcc75a116e995ee (diff)
downloadtigervnc-dd321adab0a9797de656121ffdee4417129ce6a7.tar.gz
tigervnc-dd321adab0a9797de656121ffdee4417129ce6a7.zip
Fix bad FLTK window resize handling on OS X.
http://www.fltk.org/str.php?L2775 git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4813 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--common/fltk/src/Fl_cocoa.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/fltk/src/Fl_cocoa.mm b/common/fltk/src/Fl_cocoa.mm
index 5fad4fec..19a58acf 100644
--- a/common/fltk/src/Fl_cocoa.mm
+++ b/common/fltk/src/Fl_cocoa.mm
@@ -2598,6 +2598,12 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
pt.y = [[(NSWindow*)i->xid screen] frame].size.height - (Y + h());
[(NSWindow*)i->xid setFrameOrigin:pt];
}
+ // 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;
if (is_a_resize) {