fix handling of becomeKeyWindow on OSX.

5 years ago · 52de38d8a1
1 changed files with 4 additions and 4 deletions
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@ -2068,17 +2068,17 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent

 -(void)becomeKeyWindow
 {
+    [self showWindowMenuWithAppMenu];
+    
    if([self activateAppropriateChild: true])
    {
-        [self showWindowMenuWithAppMenu];
-        
        if(_parent != nullptr)
        {
            _parent->BaseEvents->Activated();
        }
-        
-        [super becomeKeyWindow];
    }
+    
+    [super becomeKeyWindow];
 }

 -(void) restoreParentWindow;