diff --git a/src/Avalonia.Base/Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs
index 2b8786089f..2e0268a644 100644
--- a/src/Avalonia.Base/Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Base/Input/AccessKeyHandler.cs
@@ -65,14 +65,14 @@ namespace Avalonia.Input
{
if (_mainMenu != null)
{
- _mainMenu.MenuClosed -= MainMenuClosed;
+ _mainMenu.Closed -= MainMenuClosed;
}
_mainMenu = value;
if (_mainMenu != null)
{
- _mainMenu.MenuClosed += MainMenuClosed;
+ _mainMenu.Closed += MainMenuClosed;
}
}
}
diff --git a/src/Avalonia.Base/Input/IMainMenu.cs b/src/Avalonia.Base/Input/IMainMenu.cs
index cc1b88d4c3..02437b6367 100644
--- a/src/Avalonia.Base/Input/IMainMenu.cs
+++ b/src/Avalonia.Base/Input/IMainMenu.cs
@@ -26,6 +26,6 @@ namespace Avalonia.Input
///
/// Occurs when the main menu closes.
///
- event EventHandler? MenuClosed;
+ event EventHandler? Closed;
}
}
diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index a9d8e4c9c7..281ed5c6fb 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -353,7 +353,7 @@ namespace Avalonia.Controls
RaiseEvent(new RoutedEventArgs
{
- RoutedEvent = MenuOpenedEvent,
+ RoutedEvent = OpenedEvent,
Source = this,
});
}
@@ -394,7 +394,7 @@ namespace Avalonia.Controls
RaiseEvent(new RoutedEventArgs
{
- RoutedEvent = MenuClosedEvent,
+ RoutedEvent = ClosedEvent,
Source = this,
});
diff --git a/src/Avalonia.Controls/Menu.cs b/src/Avalonia.Controls/Menu.cs
index fe4d42c603..6a8cf2b515 100644
--- a/src/Avalonia.Controls/Menu.cs
+++ b/src/Avalonia.Controls/Menu.cs
@@ -60,7 +60,7 @@ namespace Avalonia.Controls
RaiseEvent(new RoutedEventArgs
{
- RoutedEvent = MenuClosedEvent,
+ RoutedEvent = ClosedEvent,
Source = this,
});
}
@@ -77,7 +77,7 @@ namespace Avalonia.Controls
RaiseEvent(new RoutedEventArgs
{
- RoutedEvent = MenuOpenedEvent,
+ RoutedEvent = OpenedEvent,
Source = this,
});
}
diff --git a/src/Avalonia.Controls/MenuBase.cs b/src/Avalonia.Controls/MenuBase.cs
index 7fc804a338..e57fadffee 100644
--- a/src/Avalonia.Controls/MenuBase.cs
+++ b/src/Avalonia.Controls/MenuBase.cs
@@ -25,16 +25,16 @@ namespace Avalonia.Controls
o => o.IsOpen);
///
- /// Defines the event.
+ /// Defines the event.
///
- public static readonly RoutedEvent MenuOpenedEvent =
- RoutedEvent.Register(nameof(MenuOpened), RoutingStrategies.Bubble);
+ public static readonly RoutedEvent OpenedEvent =
+ RoutedEvent.Register(nameof(Opened), RoutingStrategies.Bubble);
///
- /// Defines the event.
+ /// Defines the event.
///
- public static readonly RoutedEvent MenuClosedEvent =
- RoutedEvent.Register(nameof(MenuClosed), RoutingStrategies.Bubble);
+ public static readonly RoutedEvent ClosedEvent =
+ RoutedEvent.Register(nameof(Closed), RoutingStrategies.Bubble);
private bool _isOpen;
@@ -68,8 +68,8 @@ namespace Avalonia.Controls
///
public bool IsOpen
{
- get { return _isOpen; }
- protected set { SetAndRaise(IsOpenProperty, ref _isOpen, value); }
+ get => _isOpen;
+ protected set => SetAndRaise(IsOpenProperty, ref _isOpen, value);
}
///
@@ -105,19 +105,19 @@ namespace Avalonia.Controls
///
/// Occurs when a is opened.
///
- public event EventHandler? MenuOpened
+ public event EventHandler? Opened
{
- add { AddHandler(MenuOpenedEvent, value); }
- remove { RemoveHandler(MenuOpenedEvent, value); }
+ add => AddHandler(OpenedEvent, value);
+ remove => RemoveHandler(OpenedEvent, value);
}
///
/// Occurs when a is closed.
///
- public event EventHandler? MenuClosed
+ public event EventHandler? Closed
{
- add { AddHandler(MenuClosedEvent, value); }
- remove { RemoveHandler(MenuClosedEvent, value); }
+ add => AddHandler(ClosedEvent, value);
+ remove => RemoveHandler(ClosedEvent, value);
}
///
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 79a3038edf..6a76855d85 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -290,7 +290,7 @@ namespace Avalonia.Controls.Platform
Menu.PointerPressed += PointerPressed;
Menu.PointerReleased += PointerReleased;
Menu.AddHandler(AccessKeyHandler.AccessKeyPressedEvent, AccessKeyPressed);
- Menu.AddHandler(MenuBase.MenuOpenedEvent, MenuOpened);
+ Menu.AddHandler(MenuBase.OpenedEvent, MenuOpened);
Menu.AddHandler(MenuItem.PointerEnteredItemEvent, PointerEntered);
Menu.AddHandler(MenuItem.PointerExitedItemEvent, PointerExited);
Menu.AddHandler(InputElement.PointerMovedEvent, PointerMoved);
@@ -326,7 +326,7 @@ namespace Avalonia.Controls.Platform
Menu.PointerPressed -= PointerPressed;
Menu.PointerReleased -= PointerReleased;
Menu.RemoveHandler(AccessKeyHandler.AccessKeyPressedEvent, AccessKeyPressed);
- Menu.RemoveHandler(MenuBase.MenuOpenedEvent, MenuOpened);
+ Menu.RemoveHandler(MenuBase.OpenedEvent, MenuOpened);
Menu.RemoveHandler(MenuItem.PointerEnteredItemEvent, PointerEntered);
Menu.RemoveHandler(MenuItem.PointerExitedItemEvent, PointerExited);
Menu.RemoveHandler(InputElement.PointerMovedEvent, PointerMoved);
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index 803cc793fd..fda3379976 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -35,7 +35,7 @@ namespace Avalonia.Controls.UnitTests
int openedCount = 0;
- sut.MenuOpened += (sender, args) =>
+ sut.Opened += (sender, args) =>
{
openedCount++;
};
@@ -138,7 +138,7 @@ namespace Avalonia.Controls.UnitTests
int openedCount = 0;
- sut.MenuOpened += (sender, args) =>
+ sut.Opened += (sender, args) =>
{
openedCount++;
};
@@ -167,7 +167,7 @@ namespace Avalonia.Controls.UnitTests
bool opened = false;
- sut.MenuOpened += (sender, args) =>
+ sut.Opened += (sender, args) =>
{
opened = true;
};
@@ -220,7 +220,7 @@ namespace Avalonia.Controls.UnitTests
int closedCount = 0;
- sut.MenuClosed += (sender, args) =>
+ sut.Closed += (sender, args) =>
{
closedCount++;
};