Prechádzať zdrojové kódy

Merge branch 'master' into nativehostcontrol-emptybounds-fix

Dan Walmsley 4 rokov pred
rodič
commit
24c29e48ec
1 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 4 4
      native/Avalonia.Native/src/OSX/window.mm

+ 4 - 4
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;