Ken Thomases : winemac: Check the window' s display link after adding it as a child of another window, which may order it on screen.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Nov 10 10:36:20 CST 2015


Module: wine
Branch: master
Commit: d6574111c20d130a40c09ce0762ceb0a5461ada0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d6574111c20d130a40c09ce0762ceb0a5461ada0

Author: Ken Thomases <ken at codeweavers.com>
Date:   Mon Nov  9 20:31:21 2015 -0600

winemac: Check the window's display link after adding it as a child of another window, which may order it on screen.

This fixes a problem where child windows ("owned" windows in Windows
parlance) would never display their contents on OS X 10.8 or earlier.
Beginning with 10.9, Cocoa calls -windowDidChangeOcclusionState: when
the window becomes visible, which is why they display on that version
and later.

Reported by Huw Davies.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/cocoa_window.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 666a953..49afd18 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1041,6 +1041,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
             if ([self level] > [child level])
                 [child setLevel:[self level]];
             [self addChildWindow:child ordered:NSWindowAbove];
+            [child checkWineDisplayLink];
             [latentChildWindows removeObjectIdenticalTo:child];
             child.latentParentWindow = nil;
             reordered = TRUE;




More information about the wine-cvs mailing list