Ken Thomases : winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate.
Module: wine Branch: master Commit: 2b97f8c1d195fdef9a76373b2821ac986662d54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b97f8c1d195fdef9a76373b28... Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:48:41 2015 -0600 winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate. We can't prevent Cocoa from bringing disabled/no-activate windows forward. So, we need to tell Wine about the z-order change. We still do avoid telling Wine to activate disabled/no-activate windows, though. --- dlls/winemac.drv/cocoa_app.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7d61120..1196987 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1587,7 +1587,6 @@ int macdrv_err_on; BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && - !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { @@ -1693,7 +1692,7 @@ int macdrv_err_on; else if (broughtWindowForward) { [[window ancestorWineWindow] postBroughtForwardEvent]; - if (![window isKeyWindow]) + if (![window isKeyWindow] && !window.disabled && !window.noActivate) [self windowGotFocus:window]; } }
participants (1)
-
Alexandre Julliard