winemac: Track which window was brought forward by Cocoa separately from the…

winemac: Track which window was brought forward by Cocoa separately from the window receiving the click event. If the mouse is captured, we change which window receives the click event, but that shouldn't change which window we tell Wine was brought forward by Cocoa.

winemac: Track which window was brought forward by Cocoa separately from the…
5fe3c4b8 · Ken Thomases · Alexandre Julliard · 2b97f8c1 · 5fe3c4b8
Commit 5fe3c4b8 authored Jan 29, 2015 by Ken Thomases Committed by Alexandre Julliard Feb 02, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +7 -7

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -1584,7 +1584,7 @@ int macdrv_err_on;
    {
        WineWindow* window = (WineWindow*)[theEvent window];
        NSEventType type = [theEvent type];
-        BOOL broughtWindowForward = FALSE;
+        WineWindow* windowBroughtForward = nil;

        if ([window isKindOfClass:[WineWindow class]] &&
            type == NSLeftMouseDown &&
@@ -1592,7 +1592,7 @@ int macdrv_err_on;
        {
            NSWindowButton windowButton;

-            broughtWindowForward = TRUE;
+            windowBroughtForward = window;

            /* Any left-click on our window anyplace other than the close or
               minimize buttons will bring it forward. */
@@ -1606,7 +1606,7 @@ int macdrv_err_on;
                    NSPoint point = [button convertPoint:[theEvent locationInWindow] fromView:nil];
                    if ([button mouse:point inRect:[button bounds]])
                    {
-                        broughtWindowForward = FALSE;
+                        windowBroughtForward = nil;
                        break;
                    }
                }
@@ -1689,11 +1689,11 @@ int macdrv_err_on;

                macdrv_release_event(event);
            }
-            else if (broughtWindowForward)
+            else if (windowBroughtForward)
            {
-                [[window ancestorWineWindow] postBroughtForwardEvent];
-                if (![window isKeyWindow] && !window.disabled && !window.noActivate)
-                    [self windowGotFocus:window];
+                [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent];
+                if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate)
+                    [self windowGotFocus:windowBroughtForward];
            }
        }