From 68197f88586e4fea7089f2b5f15f06dc976bc7d5 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 21 Apr 2020 13:02:07 -0300
Subject: [PATCH] Rename NativeMenuItem.Enabled to IsEnabled, and
 NeedsUpdateEvent to Opening event.

---
 samples/ControlCatalog/MainWindow.xaml.cs    |  2 +-
 src/Avalonia.Controls/NativeMenu.cs          |  4 ++--
 src/Avalonia.Controls/NativeMenuItem.cs      | 14 +++++++-------
 src/Avalonia.FreeDesktop/DBusMenuExporter.cs |  4 ++--
 src/Avalonia.Native/IAvnMenuItem.cs          |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 6619d3600c..81e5f82f76 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -32,7 +32,7 @@ namespace ControlCatalog
 
             var fileMenu = (NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu;
             
-            fileMenu.NeedsUpdate += (sender, e)=>
+            fileMenu.Opening += (sender, e)=>
             {
                 fileMenu.Items.Clear();
                 fileMenu.Items.Add(new NativeMenuItem("Test 1"));
diff --git a/src/Avalonia.Controls/NativeMenu.cs b/src/Avalonia.Controls/NativeMenu.cs
index 47a8d1909d..58406a38b1 100644
--- a/src/Avalonia.Controls/NativeMenu.cs
+++ b/src/Avalonia.Controls/NativeMenu.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Raised when the user clicks the menu and before its opened. Use this event to update the menu dynamically.
         /// </summary>
-        public event EventHandler<EventArgs> NeedsUpdate;
+        public event EventHandler<EventArgs> Opening;
 
         public NativeMenu()
         {
@@ -28,7 +28,7 @@ namespace Avalonia.Controls
 
         void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate ()
         {
-            NeedsUpdate?.Invoke(this, EventArgs.Empty);
+            Opening?.Invoke(this, EventArgs.Empty);
         }
 
         private void Validator(NativeMenuItemBase obj)
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index 8e3ea1fb29..af87745600 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Controls
     {
         private string _header;
         private KeyGesture _gesture;
-        private bool _enabled = true;
+        private bool _isEnabled = true;
         private ICommand _command;
         private bool _isChecked = false;
 
@@ -112,18 +112,18 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object> CommandParameterProperty =
             Button.CommandParameterProperty.AddOwner<MenuItem>();
 
-        public static readonly DirectProperty<NativeMenuItem, bool> EnabledProperty =
-           AvaloniaProperty.RegisterDirect<NativeMenuItem, bool>(nameof(Enabled), o => o.Enabled, (o, v) => o.Enabled = v, true);
+        public static readonly DirectProperty<NativeMenuItem, bool> IsEnabledProperty =
+           AvaloniaProperty.RegisterDirect<NativeMenuItem, bool>(nameof(IsEnabled), o => o.IsEnabled, (o, v) => o.IsEnabled = v, true);
 
-        public bool Enabled
+        public bool IsEnabled
         {
-            get => _enabled;
-            set => SetAndRaise(EnabledProperty, ref _enabled, value);
+            get => _isEnabled;
+            set => SetAndRaise(IsEnabledProperty, ref _isEnabled, value);
         }
 
         void CanExecuteChanged()
         {
-            Enabled = _command?.CanExecute(null) ?? true;
+            IsEnabled = _command?.CanExecute(null) ?? true;
         }
 
         public bool HasClickHandlers => Clicked != null;
diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index 90239b5a49..06bbc97dac 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -210,7 +210,7 @@ namespace Avalonia.FreeDesktop
                             return null;
                         if (item.Menu != null && item.Menu.Items.Count == 0)
                             return false;
-                        if (item.Enabled == false)
+                        if (item.IsEnabled == false)
                             return false;
                         return null;
                     }
@@ -321,7 +321,7 @@ namespace Avalonia.FreeDesktop
 
                     if (item is NativeMenuItem menuItem)
                     {
-                        if (menuItem?.Enabled == true)
+                        if (menuItem?.IsEnabled == true)
                             menuItem.RaiseClick();
                     }
                 }
diff --git a/src/Avalonia.Native/IAvnMenuItem.cs b/src/Avalonia.Native/IAvnMenuItem.cs
index dbe8a77ba6..6c1177f9cf 100644
--- a/src/Avalonia.Native/IAvnMenuItem.cs
+++ b/src/Avalonia.Native/IAvnMenuItem.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Native.Interop
             {
                 if (item.Command != null || item.HasClickHandlers)
                 {
-                    return item.Enabled;
+                    return item.IsEnabled;
                 }
 
                 return false;