From 31bfcb6b05262cad46fce35340932b742e1b88e6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 23 Nov 2020 11:39:52 +0100
Subject: [PATCH 1/3] Fix BindingValue comparison.

`NativeMenuBar` click forwarding was broken by https://github.com/AvaloniaUI/Avalonia/pull/4648 - this fixes it.
---
 src/Avalonia.Controls/NativeMenuBar.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/NativeMenuBar.cs b/src/Avalonia.Controls/NativeMenuBar.cs
index 63bb39108f..5d2e1087a7 100644
--- a/src/Avalonia.Controls/NativeMenuBar.cs
+++ b/src/Avalonia.Controls/NativeMenuBar.cs
@@ -1,7 +1,6 @@
 using System;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
-using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -16,7 +15,7 @@ namespace Avalonia.Controls
             EnableMenuItemClickForwardingProperty.Changed.Subscribe(args =>
             {
                 var item = (MenuItem)args.Sender;
-                if (args.NewValue.Equals(true))
+                if (args.NewValue.GetValueOrDefault<bool>())
                     item.Click += OnMenuItemClick;
                 else
                     item.Click -= OnMenuItemClick;

From 5d4b56d04207025a4e161606ceac6a34b11bfd8b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 23 Nov 2020 12:18:16 +0100
Subject: [PATCH 2/3] NativeMenuItem.Clicked -> Click.

And mark `Clicked` as obsolete. For consistency with `MenuItem.Click`.
---
 src/Avalonia.Controls/NativeMenuItem.cs          | 16 +++++++++++++---
 .../AvaloniaNativeMenuExporter.cs                |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index a0fec9e677..e8cb59e76e 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -151,7 +151,7 @@ namespace Avalonia.Controls
             IsEnabled = _command?.CanExecute(null) ?? true;
         }
 
-        public bool HasClickHandlers => Clicked != null;
+        public bool HasClickHandlers => Click != null;
 
         public ICommand Command
         {
@@ -182,11 +182,21 @@ namespace Avalonia.Controls
             set { SetValue(CommandParameterProperty, value); }
         }
 
-        public event EventHandler Clicked;
+        /// <summary>
+        /// Occurs when a <see cref="NativeMenuItem"/> is clicked.
+        /// </summary>
+        public event EventHandler Click;
+
+        [Obsolete("Use Click event.")]
+        public event EventHandler Clicked
+        {
+            add => Click += value;
+            remove => Click -= value;
+        }
 
         void INativeMenuItemExporterEventsImplBridge.RaiseClicked()
         {
-            Clicked?.Invoke(this, new EventArgs());
+            Click?.Invoke(this, new EventArgs());
 
             if (Command?.CanExecute(CommandParameter) == true)
             {
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index b192de95de..2e3408eca5 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -60,7 +60,7 @@ namespace Avalonia.Native
                 Header = "About Avalonia",
             };
 
-            aboutItem.Clicked += async (sender, e) =>
+            aboutItem.Click += async (sender, e) =>
             {
                 var dialog = new AboutAvaloniaDialog();
 

From e59573d6309bb98e75ccd75d9c3c8050a9de4d7a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 23 Nov 2020 12:33:17 +0100
Subject: [PATCH 3/3] Mark NativeMenuItem.Menu as content property.

Means that submenus don't need the extra `<NativeMenuItem.Menu>` element.
---
 samples/ControlCatalog/DecoratedWindow.xaml | 30 ++++------
 samples/ControlCatalog/MainWindow.xaml      | 66 +++++++++------------
 src/Avalonia.Controls/NativeMenuItem.cs     |  2 +
 3 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/samples/ControlCatalog/DecoratedWindow.xaml b/samples/ControlCatalog/DecoratedWindow.xaml
index 8e4c97b7f0..5251a2fa55 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml
+++ b/samples/ControlCatalog/DecoratedWindow.xaml
@@ -6,25 +6,21 @@
         <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="Decorated">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Open"/>
-            <NativeMenuItem Header="Recent">
-              <NativeMenuItem.Menu>
-                <NativeMenu/>
-              </NativeMenuItem.Menu>
-            </NativeMenuItem>
-            <NativeMenuItem Header="Quit Avalonia" Gesture="CMD+Q"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Open"/>
+          <NativeMenuItem Header="Recent">
+            <NativeMenuItem.Menu>
+              <NativeMenu/>
+            </NativeMenuItem.Menu>
+          </NativeMenuItem>
+          <NativeMenuItem Header="Quit Avalonia" Gesture="CMD+Q"/>
+        </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Edit">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Copy"/>
-            <NativeMenuItem Header="Paste"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Copy"/>
+          <NativeMenuItem Header="Paste"/>
+        </NativeMenu>
       </NativeMenuItem>
     </NativeMenu>
   </NativeMenu.Menu>
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 97bd88f5e4..6a70bb082f 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -16,47 +16,39 @@
   <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="File">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Open" Clicked="OnOpenClicked" Gesture="Ctrl+O"/>
-            <NativeMenuItemSeperator/>
-            <NativeMenuItem Icon="/Assets/github_icon.png" Header="Recent">
-              <NativeMenuItem.Menu>
-                <NativeMenu/>
-              </NativeMenuItem.Menu>
-            </NativeMenuItem>
-            <NativeMenuItemSeperator/>
-            <NativeMenuItem Header="{x:Static local:MainWindow.MenuQuitHeader}"
-                            Gesture="{x:Static local:MainWindow.MenuQuitGesture}"
-                            Clicked="OnCloseClicked" />
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Open" Clicked="OnOpenClicked" Gesture="Ctrl+O"/>
+          <NativeMenuItemSeperator/>
+          <NativeMenuItem Icon="/Assets/github_icon.png" Header="Recent">
+            <NativeMenu/>
+          </NativeMenuItem>
+          <NativeMenuItemSeperator/>
+          <NativeMenuItem Header="{x:Static local:MainWindow.MenuQuitHeader}"
+                          Gesture="{x:Static local:MainWindow.MenuQuitGesture}"
+                          Clicked="OnCloseClicked" />
+        </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Edit">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-            <NativeMenuItem Header="Copy"/>
-            <NativeMenuItem Header="Paste"/>
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Copy"/>
+          <NativeMenuItem Header="Paste"/>
+        </NativeMenu>
       </NativeMenuItem>
       <NativeMenuItem Header="Options">
-        <NativeMenuItem.Menu>
-          <NativeMenu>
-           <NativeMenuItem Header="Check Me (None)" 
-                            Command="{Binding ToggleMenuItemCheckedCommand}"
-                            ToggleType="None"
-                            IsChecked="{Binding IsMenuItemChecked}"  />
-            <NativeMenuItem Header="Check Me (CheckBox)" 
-                            Command="{Binding ToggleMenuItemCheckedCommand}"
-                            ToggleType="CheckBox"
-                            IsChecked="{Binding IsMenuItemChecked}"  />
-            <NativeMenuItem Header="Check Me (Radio)" 
-                            Command="{Binding ToggleMenuItemCheckedCommand}"
-                            ToggleType="Radio"
-                            IsChecked="{Binding IsMenuItemChecked}"  />
-          </NativeMenu>
-        </NativeMenuItem.Menu>
+        <NativeMenu>
+          <NativeMenuItem Header="Check Me (None)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="None"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+          <NativeMenuItem Header="Check Me (CheckBox)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="CheckBox"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+          <NativeMenuItem Header="Check Me (Radio)" 
+                          Command="{Binding ToggleMenuItemCheckedCommand}"
+                          ToggleType="Radio"
+                          IsChecked="{Binding IsMenuItemChecked}"  />
+        </NativeMenu>
       </NativeMenuItem>
     </NativeMenu>
   </NativeMenu.Menu>
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index e8cb59e76e..76197b62ad 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -2,6 +2,7 @@ using System;
 using System.Windows.Input;
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
+using Avalonia.Metadata;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
@@ -62,6 +63,7 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<NativeMenuItem, NativeMenu> MenuProperty =
             AvaloniaProperty.RegisterDirect<NativeMenuItem, NativeMenu>(nameof(Menu), o => o.Menu, (o, v) => o.Menu = v);
 
+        [Content]
         public NativeMenu Menu
         {
             get => _menu;