From 793ab7d457ef0412069492b6626894d2e23c1a79 Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Wed, 12 Aug 2015 18:02:32 -0500 Subject: [PATCH] winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event. Not sending the brought-forward event for a click that was sent was an artifact of a time when that branch was only used for posting a request for focus. When I added the brought-forward event, I didn't reconsider that logic. --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 82925c8e224..8e1f31816ed 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1700,10 +1700,10 @@ int macdrv_err_on; } } - if (!process && windowBroughtForward) + if (windowBroughtForward) { [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; - if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) [self windowGotFocus:windowBroughtForward]; } -- 2.11.4.GIT