Revision: 4818
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4818&view=rev
Author: ossman_
Date: 2011-11-25 09:18:28 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Updated patch from upstream.
Modified Paths:
--------------
trunk/common/fltk/src/Fl_cocoa.mm
Modified: trunk/common/fltk/src/Fl_cocoa.mm
===================================================================
--- trunk/common/fltk/src/Fl_cocoa.mm 2011-11-25 01:12:58 UTC (rev 4817)
+++ trunk/common/fltk/src/Fl_cocoa.mm 2011-11-25 09:18:28 UTC (rev 4818)
@@ -1062,6 +1062,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)([[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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
