Browse Source

Merge branch 'master' into fixes/4205-slider-keyboard

pull/5545/head
Jumar Macato 6 years ago
committed by GitHub
parent
commit
50208141e5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      native/Avalonia.Native/src/OSX/window.mm
  2. 2
      src/Avalonia.Dialogs/ManagedFileChooserSources.cs

8
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;

2
src/Avalonia.Dialogs/ManagedFileChooserSources.cs

@ -67,7 +67,7 @@ namespace Avalonia.Dialogs
{ {
Directory.GetFiles(x.VolumePath); Directory.GetFiles(x.VolumePath);
} }
catch (UnauthorizedAccessException _) catch (Exception _)
{ {
return null; return null;
} }

Loading…
Cancel
Save