Browse Source

Switch off from deprecated APIs in Avalonia.MonoMac.

pull/1663/head
Jeremy Koritzinsky 8 years ago
parent
commit
43e6bd2d49
  1. 9
      src/OSX/Avalonia.MonoMac/SystemDialogsImpl.cs

9
src/OSX/Avalonia.MonoMac/SystemDialogsImpl.cs

@ -7,6 +7,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Platform; using Avalonia.Controls.Platform;
using Avalonia.Platform; using Avalonia.Platform;
using MonoMac.AppKit; using MonoMac.AppKit;
using MonoMac.Foundation;
namespace Avalonia.MonoMac namespace Avalonia.MonoMac
{ {
@ -24,9 +25,9 @@ namespace Avalonia.MonoMac
else else
{ {
if (panel is NSOpenPanel openPanel) if (panel is NSOpenPanel openPanel)
tcs.SetResult(openPanel.Filenames); tcs.SetResult(openPanel.Urls.Select(url => url.AbsoluteString).ToArray());
else else
tcs.SetResult(new[] { panel.Filename }); tcs.SetResult(new[] { panel.Url.AbsoluteString });
} }
panel.OrderOut(panel); panel.OrderOut(panel);
keyWindow?.MakeKeyAndOrderFront(keyWindow); keyWindow?.MakeKeyAndOrderFront(keyWindow);
@ -62,7 +63,7 @@ namespace Avalonia.MonoMac
panel = new NSSavePanel(); panel = new NSSavePanel();
panel.Title = panel.Title; panel.Title = panel.Title;
if (dialog.InitialDirectory != null) if (dialog.InitialDirectory != null)
panel.Directory = dialog.InitialDirectory; panel.DirectoryUrl = new NSUrl(dialog.InitialDirectory);
if (dialog.InitialFileName != null) if (dialog.InitialFileName != null)
panel.NameFieldStringValue = dialog.InitialFileName; panel.NameFieldStringValue = dialog.InitialFileName;
if (dialog.Filters?.Count > 0) if (dialog.Filters?.Count > 0)
@ -84,7 +85,7 @@ namespace Avalonia.MonoMac
CanChooseFiles = false CanChooseFiles = false
}; };
if (dialog.DefaultDirectory != null) if (dialog.DefaultDirectory != null)
panel.Directory = dialog.DefaultDirectory; panel.DirectoryUrl = new NSUrl(dialog.DefaultDirectory);
return (await RunPanel(panel, parent))?.FirstOrDefault(); return (await RunPanel(panel, parent))?.FirstOrDefault();
} }
} }

Loading…
Cancel
Save