Browse Source
Merge branch 'master' into fixes/4205-slider-keyboard
pull/5545/head
Jumar Macato
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
native/Avalonia.Native/src/OSX/window.mm
-
src/Avalonia.Dialogs/ManagedFileChooserSources.cs
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -67,7 +67,7 @@ namespace Avalonia.Dialogs |
|
|
|
{ |
|
|
|
Directory.GetFiles(x.VolumePath); |
|
|
|
} |
|
|
|
catch (UnauthorizedAccessException _) |
|
|
|
catch (Exception _) |
|
|
|
{ |
|
|
|
return null; |
|
|
|
} |
|
|
|
|