From 42b0988d1ab937772ac58a47ab5a8f55ece271fb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Mon, 8 May 2023 12:40:20 +0200
Subject: [PATCH] Make MenuFlyout.ItemTemplate a styled property.

---
 src/Avalonia.Controls/Flyouts/MenuFlyout.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
index a2ce93ee6d..1e5f43cf41 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -24,9 +24,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="ItemTemplate"/> property
         /// </summary>
-        public static readonly DirectProperty<MenuFlyout, IDataTemplate?> ItemTemplateProperty =
-            AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
-                x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
+        public static readonly StyledProperty<IDataTemplate?> ItemTemplateProperty =
+            AvaloniaProperty.Register<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate));
 
         /// <summary>
         /// Defines the <see cref="ItemContainerTheme"/> property.
@@ -59,8 +58,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IDataTemplate? ItemTemplate
         {
-            get => _itemTemplate;
-            set => SetAndRaise(ItemTemplateProperty, ref _itemTemplate, value);
+            get => GetValue(ItemTemplateProperty);
+            set => SetValue(ItemTemplateProperty, value);
         }
 
         /// <summary>
@@ -82,7 +81,6 @@ namespace Avalonia.Controls
         }
         
         private Classes? _classes;
-        private IDataTemplate? _itemTemplate;
 
         protected override Control CreatePresenter()
         {