merge 8.5

1 files changed, 24 insertions, 10 deletions

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0b32e7e..91cc348 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -808,7 +808,7 @@ ConfigureRestrictProc(
 {
     const NSRect *rectsBeingDrawn;
     NSInteger rectsBeingDrawnCount;
-
+    
     [self getRectsBeingDrawn:&rectsBeingDrawn count:&rectsBeingDrawnCount];
 
 #ifdef TK_MAC_DEBUG_DRAWING
@@ -844,7 +844,8 @@ ConfigureRestrictProc(
 
 -(void) setFrameSize: (NSSize)newsize
 {
-    if ( [self inLiveResize] ) {
+    [super setFrameSize: newsize];
+    if ([self inLiveResize]) {
 	NSWindow *w = [self window];
 	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 	Tk_Window tkwin = (Tk_Window) winPtr;
@@ -853,17 +854,29 @@ ConfigureRestrictProc(
 	ClientData oldArg;
     	Tk_RestrictProc *oldProc;
 
-	/* Resize the NSView */
-	[super setFrameSize: newsize];
-
-	/* Disable drawing until the window has been completely configured.*/
+	/* This can be called from outside the Tk event loop.
+	 * Since it calls Tcl_DoOneEvent, we need to make sure we
+	 * don't clobber the AutoreleasePool set up by the caller.
+	 */
+	[NSApp setPoolProtected:YES];
+	
+	/*
+	 * Try to prevent flickers and flashes.
+	 *
+	 * This stops the flickers, but on OSX 10.11 flashes still occur when
+	 * the width of the window is 16, 32, 48, 64, 80, 96, 112, 256, 512,
+	 * 768, ...
+	 */
+	[w disableFlushWindow];
+	
+	/* Disable Tk drawing until the window has been completely configured.*/
 	TkMacOSXSetDrawingEnabled(winPtr, 0);
 
 	 /* Generate and handle a ConfigureNotify event for the new size.*/
 	TkGenWMConfigureEvent(tkwin, Tk_X(tkwin), Tk_Y(tkwin), width, height,
 			      TK_SIZE_CHANGED | TK_MACOSX_HANDLE_EVENT_IMMEDIATELY);
     	oldProc = Tk_RestrictEvents(ConfigureRestrictProc, NULL, &oldArg);
-	while ( Tk_DoOneEvent(TK_X_EVENTS|TK_DONT_WAIT) ) {}
+	while (Tk_DoOneEvent(TK_X_EVENTS|TK_DONT_WAIT)) {}
     	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
 
 	/* Now that Tk has configured all subwindows we can create the clip regions. */
@@ -875,9 +888,10 @@ ConfigureRestrictProc(
 	HIRect bounds = NSRectToCGRect([self bounds]);
 	HIShapeRef shape = HIShapeCreateWithRect(&bounds);
 	[self generateExposeEvents: shape];
-	while ( Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT) ) {}
-    } else {
-        [super setFrameSize: newsize];
+	while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {}
+	[w enableFlushWindow];
+	[w flushWindowIfNeeded];
+	[NSApp setPoolProtected:NO];
     }
 }