Browse Source
Merge pull request #5538 from AvaloniaUI/fixes/osx-becomeKeyWindowHandling
fix handling of becomeKeyWindow on OSX.
pull/5542/head
Dan Walmsley
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
native/Avalonia.Native/src/OSX/window.mm
|
|
@ -2068,17 +2068,17 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent |
|
|
|
|
|
|
|
|
-(void)becomeKeyWindow |
|
|
-(void)becomeKeyWindow |
|
|
{ |
|
|
{ |
|
|
|
|
|
[self showWindowMenuWithAppMenu]; |
|
|
|
|
|
|
|
|
if([self activateAppropriateChild: true]) |
|
|
if([self activateAppropriateChild: true]) |
|
|
{ |
|
|
{ |
|
|
[self showWindowMenuWithAppMenu]; |
|
|
|
|
|
|
|
|
|
|
|
if(_parent != nullptr) |
|
|
if(_parent != nullptr) |
|
|
{ |
|
|
{ |
|
|
_parent->BaseEvents->Activated(); |
|
|
_parent->BaseEvents->Activated(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
[super becomeKeyWindow]; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
[super becomeKeyWindow]; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
-(void) restoreParentWindow; |
|
|
-(void) restoreParentWindow; |
|
|
|
