winemac: During live resize, force occasional redisplay due to spontaneous redrawing.

This commit is contained in:
Ken Thomases 2013-04-02 03:17:48 -05:00 committed by Alexandre Julliard
parent 9374c5bb56
commit 94dc91a45d
2 changed files with 39 additions and 0 deletions

View File

@ -52,6 +52,8 @@ @interface WineWindow : NSPanel <NSWindowDelegate>
NSInteger levelWhenActive;
NSTimer* liveResizeDisplayTimer;
BOOL causing_becomeKeyWindow;
BOOL ignore_windowMiniaturize;
BOOL ignore_windowDeminiaturize;

View File

@ -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 ----------