Browse Source

Merge branch 'fixes/osx-implement-default-app-menu' of github.com:AvaloniaUI/Avalonia into fixes/osx-implement-default-app-menu

pull/3220/head
Jumar Macato 7 years ago
parent
commit
67cb3888b2
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
  1. 1
      src/Avalonia.Native/Avalonia.Native.csproj
  2. 10
      src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

1
src/Avalonia.Native/Avalonia.Native.csproj

@ -22,5 +22,6 @@
<PackageReference Include="SharpGenTools.Sdk" Version="1.1.2" PrivateAssets="all" />
<PackageReference Include="SharpGen.Runtime.COM" Version="1.1.0" />
<ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\..\packages\Avalonia\Avalonia.Dialogs.csproj" />
</ItemGroup>
</Project>

10
src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@ -10,6 +10,8 @@ using Avalonia.Input;
using Avalonia.Native.Interop;
using Avalonia.Platform.Interop;
using Avalonia.Threading;
using Avalonia.Dialogs;
using Avalonia.Controls.ApplicationLifetimes;
namespace Avalonia.Native
{
@ -221,9 +223,13 @@ namespace Avalonia.Native
Header = "About Avalonia",
};
aboutItem.Clicked += (sender, e) =>
aboutItem.Clicked += async (sender, e) =>
{
// Open about dialog.
var dialog = new AboutAvaloniaDialog();
var mainWindow = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
await dialog.ShowDialog(mainWindow);
};
result.Add(aboutItem);

Loading…
Cancel
Save