Merged from trunk:

2007-12-20  Richard Hult  <richard@imendio.com>

	Merged from trunk:

	* gdk/quartz/GdkQuartzWindow.c:
	* gdk/quartz/GdkQuartzWindow.h: Make manual resizing smoother by
	processing events after changing the size.

svn path=/branches/gtk-2-12/; revision=19207
This commit is contained in:
Richard Hult
2007-12-20 13:32:58 +00:00
committed by Richard Hult
parent 4f80d8cad3
commit ea100431e6
3 changed files with 18 additions and 1 deletions

View File

@@ -1,3 +1,11 @@
2007-12-20 Richard Hult <richard@imendio.com>
Merged from trunk:
* gdk/quartz/GdkQuartzWindow.c:
* gdk/quartz/GdkQuartzWindow.h: Make manual resizing smoother by
processing events after changing the size.
2007-12-17 Kristian Rietveld <kris@imendio.com>
Merge from trunk.

View File

@@ -301,9 +301,11 @@
float dx, dy;
NSSize min_size;
if (!inManualResize)
if (!inManualResize || inTrackManualResize)
return NO;
inTrackManualResize = YES;
currentLocation = [self convertBaseToScreen:[self mouseLocationOutsideOfEventStream]];
currentLocation.x -= initialResizeFrame.origin.x;
currentLocation.y -= initialResizeFrame.origin.y;
@@ -332,6 +334,12 @@
[self setFrame:newFrame display:YES];
/* Let the resizing be handled by GTK+. */
if (g_main_context_pending (NULL))
g_main_context_iteration (NULL, FALSE);
inTrackManualResize = NO;
return YES;
}

View File

@@ -28,6 +28,7 @@
/* Manually triggered move/resize (not by the window manager) */
BOOL inManualMove;
BOOL inManualResize;
BOOL inTrackManualResize;
NSPoint initialMoveLocation;
NSPoint initialResizeLocation;
NSRect initialResizeFrame;