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

samples/ControlCatalog/MainWindow.xaml

@@ -37,12 +37,20 @@
     </NativeMenu>
   </NativeMenu.Menu>
 
-  <Window.DataTemplates>
+ <Window.DataTemplates>
-        <DataTemplate DataType="vm:NotificationViewModel">
+    <DataTemplate DataType="vm:NotificationViewModel">
-            <v:CustomNotificationView />
+      <v:CustomNotificationView />
-        </DataTemplate>
+    </DataTemplate>
-    </Window.DataTemplates>
+  </Window.DataTemplates>
-    <Panel>
+  <DockPanel LastChildFill="True">
-        <local:MainView/>
+    <Menu Name="MainMenu" DockPanel.Dock="Top">
-    </Panel>
+      <MenuItem Header="File">
+        <MenuItem Header="Exit" />
+      </MenuItem>
+      <MenuItem Header="Help">
+        <MenuItem Header="About" />
+      </MenuItem>
+    </Menu>
+    <local:MainView />
+  </DockPanel>
 </Window>

samples/ControlCatalog/MainWindow.xaml.cs

@@ -31,20 +31,28 @@ namespace ControlCatalog
 
             DataContext = new MainWindowViewModel(_notificationArea);
             _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu;
+            var mainMenu = this.FindControl<Menu>("MainMenu");
+            mainMenu.AttachedToVisualTree += MenuAttached;
+        }
+
+        public void MenuAttached(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            if (NativeMenu.GetIsNativeMenuExported(this) && sender is Menu mainMenu)
+            {
+                mainMenu.IsVisible = false;
+            }
         }
 
         public void OnOpenClicked(object sender, EventArgs args)
         {
             _recentMenu.Items.Insert(0, new NativeMenuItem("Item " + (_recentMenu.Items.Count + 1)));
         }
-        
+
         public void OnCloseClicked(object sender, EventArgs args)
         {
             Close();
         }
 
-
-
         private void InitializeComponent()
         {
             // TODO: iOS does not support dynamically loading assemblies