Ken Thomases : winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Aug 13 04:23:49 CDT 2015


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

Author: Ken Thomases <ken at codeweavers.com>
Date:   Wed Aug 12 18:02:32 2015 -0500

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 82925c8..8e1f318 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];
         }
 




More information about the wine-cvs mailing list