From 94dc91a45dcbfcee93d7b60c253eb1885dc8ee6c Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Tue, 2 Apr 2013 03:17:48 -0500 Subject: [PATCH] winemac: During live resize, force occasional redisplay due to spontaneous redrawing. --- dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index ea7988d1606..c76f735d117 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -52,6 +52,8 @@ @interface WineWindow : NSPanel NSInteger levelWhenActive; + NSTimer* liveResizeDisplayTimer; + BOOL causing_becomeKeyWindow; BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1d5c551c9d9..68644fa40a8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -350,6 +350,8 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w - (void) dealloc { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; [queue release]; [latentParentWindow release]; [shape release]; @@ -1115,6 +1117,13 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } + - (void) windowDidEndLiveResize:(NSNotification *)notification + { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; + liveResizeDisplayTimer = nil; + } + - (void)windowDidMove:(NSNotification *)notification { [self windowDidResize:notification]; @@ -1176,6 +1185,34 @@ - (void)windowWillMiniaturize:(NSNotification *)notification ignore_windowMiniaturize = FALSE; } + - (void) windowWillStartLiveResize:(NSNotification *)notification + { + // There's a strange restriction in window redrawing during Cocoa- + // managed window resizing. Only calls to -[NSView setNeedsDisplay...] + // that happen synchronously when Cocoa tells us that our window size + // has changed or asynchronously in a short interval thereafter provoke + // the window to redraw. Calls to those methods that happen asynchronously + // a half second or more after the last change of the window size aren't + // heeded until the next resize-related user event (e.g. mouse movement). + // + // Wine often has a significant delay between when it's been told that + // the window has changed size and when it can flush completed drawing. + // So, our windows would get stuck with incomplete drawing for as long + // as the user holds the mouse button down and doesn't move it. + // + // We address this by "manually" asking our windows to check if they need + // redrawing every so often (during live resize only). + [self windowDidEndLiveResize:nil]; + liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 + target:self + selector:@selector(displayIfNeeded) + userInfo:nil + repeats:YES]; + [liveResizeDisplayTimer retain]; + [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer + forMode:NSRunLoopCommonModes]; + } + /* * ---------- NSPasteboardOwner methods ----------