Merge pull request #7341 from AvaloniaUI/fixes/standard-osx-item-generation

Fixes/standard osx item generation

Author: danwalmsley

samples/ControlCatalog/App.xaml

@@ -3,6 +3,7 @@
              xmlns:vm="using:ControlCatalog.ViewModels"
              x:DataType="vm:ApplicationViewModel"
              x:CompileBindings="True"
+             Name="Avalonia ControlCatalog"
              x:Class="ControlCatalog.App">
   <Application.Styles>
     <Style Selector="TextBlock.h1, TextBlock.h2, TextBlock.h3">

src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml

@@ -95,7 +95,7 @@
       </StackPanel>
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
         <TextBlock Text="Chat Room | " />
-        <Button Classes="Hyperlink" CommandParameter="https://gitter.im/AvaloniaUI/Avalonia/"  />
+        <Button Classes="Hyperlink" CommandParameter="https://t.me/Avalonia"  />
       </StackPanel>
      </StackPanel> 
     <StackPanel VerticalAlignment="Bottom" Margin="10">

src/Avalonia.Dialogs/Avalonia.Dialogs.csproj

@@ -8,6 +8,7 @@
       <SubType>Designer</SubType>
     </AvaloniaResource>
     <AvaloniaResource Include="Assets\*" />
+    <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
 
   <Import Project="..\..\build\BuildTargets.targets" />

src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@@ -70,74 +70,76 @@ private NativeMenu CreateDefaultAppMenu()
             var result = new NativeMenu();
 
             var aboutItem = new NativeMenuItem("About Avalonia");
-            aboutItem.Click += async (sender, e) =>
+            
+            aboutItem.Click += async (_, _) =>
             {
                 var dialog = new AboutAvaloniaDialog();
 
-                var mainWindow = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
-
-                await dialog.ShowDialog(mainWindow);
+                if (Application.Current is
+                    { ApplicationLifetime: IClassicDesktopStyleApplicationLifetime { MainWindow: { } mainWindow } })
+                {
+                    await dialog.ShowDialog(mainWindow);   
+                }
             };
+            
             result.Add(aboutItem);
 
-            var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
-            if (macOpts == null || !macOpts.DisableDefaultApplicationMenuItems)
-            {
-                result.Add(new NativeMenuItemSeparator());
+            return result;
+        }
 
-                var servicesMenu = new NativeMenuItem("Services");
-                servicesMenu.Menu = new NativeMenu
-                {
-                    [MacOSNativeMenuCommands.IsServicesSubmenuProperty] = true
-                };
-                result.Add(servicesMenu);
+        private void PopulateStandardOSXMenuItems(NativeMenu appMenu)
+        {
+            appMenu.Add(new NativeMenuItemSeparator());
 
-                result.Add(new NativeMenuItemSeparator());
+            var servicesMenu = new NativeMenuItem("Services");
+            servicesMenu.Menu = new NativeMenu { [MacOSNativeMenuCommands.IsServicesSubmenuProperty] = true };
 
-                var hideItem = new NativeMenuItem("Hide " + Application.Current.Name)
-                {
-                    Gesture = new KeyGesture(Key.H, KeyModifiers.Meta)
-                };
-                hideItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.HideApp();
-                };
-                result.Add(hideItem);
+            appMenu.Add(servicesMenu);
 
+            appMenu.Add(new NativeMenuItemSeparator());
 
-                var hideOthersItem = new NativeMenuItem("Hide Others")
-                {
-                    Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta | KeyModifiers.Alt)
-                };
-                hideOthersItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.HideOthers();
-                };
-                result.Add(hideOthersItem);
+            var hideItem = new NativeMenuItem("Hide " + (Application.Current?.Name ?? "Application"))
+            {
+                Gesture = new KeyGesture(Key.H, KeyModifiers.Meta)
+            };
 
+            hideItem.Click += (_, _) =>
+            {
+                _applicationCommands.HideApp();
+            };
 
-                var showAllItem = new NativeMenuItem("Show All");
-                showAllItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.ShowAll();
-                };
-                result.Add(showAllItem);
+            appMenu.Add(hideItem);
 
-                result.Add(new NativeMenuItemSeparator());
+            var hideOthersItem = new NativeMenuItem("Hide Others")
+            {
+                Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta | KeyModifiers.Alt)
+            };
+            hideOthersItem.Click += (_, _) =>
+            {
+                _applicationCommands.HideOthers();
+            };
+            appMenu.Add(hideOthersItem);
 
-                var quitItem = new NativeMenuItem("Quit")
-                {
-                    Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta)
-                };
-                quitItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.ShowAll();
-                };
-                result.Add(quitItem);
-            }
+            var showAllItem = new NativeMenuItem("Show All");
+            showAllItem.Click += (_, _) =>
+            {
+                _applicationCommands.ShowAll();
+            };
 
+            appMenu.Add(showAllItem);
 
-            return result;
+            appMenu.Add(new NativeMenuItemSeparator());
+
+            var quitItem = new NativeMenuItem("Quit") { Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta) };
+            quitItem.Click += (_, _) =>
+            {
+                if (Application.Current is { ApplicationLifetime: IControlledApplicationLifetime lifetime })
+                {
+                    lifetime.Shutdown();
+                }
+            };
+
+            appMenu.Add(quitItem);
         }
 
         private void DoLayoutReset(bool forceUpdate = false)
@@ -213,6 +215,13 @@ private void SetMenu(NativeMenu menu)
 
                 _nativeMenu.Initialize(this, appMenuHolder, "");
 
+                var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
+
+                if (macOpts == null || !macOpts.DisableDefaultApplicationMenuItems)
+                {
+                    PopulateStandardOSXMenuItems(menu);
+                }
+
                 setMenu = true;
             }