Merge pull request #10020 from workgroupengineering/features/MenuFlyo…

…ut/ItemContainerTheme feat(MenuFlyout): Add ItemContainerTheme
AvaloniaUI · Jan 26, 2023 · 30d4644 · 30d4644
2 parents 594dc91 + caa2911
commit 30d4644
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyout.cs b/src/Avalonia.Controls/Flyouts/MenuFlyout.cs
@@ -3,6 +3,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -27,6 +28,12 @@ public MenuFlyout()
             AvaloniaProperty.RegisterDirect<MenuFlyout, IDataTemplate?>(nameof(ItemTemplate),
                 x => x.ItemTemplate, (x, v) => x.ItemTemplate = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemContainerTheme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
+            ItemsControl.ItemContainerThemeProperty.AddOwner<MenuFlyout>();
+
         public Classes FlyoutPresenterClasses => _classes ??= new Classes();
 
         /// <summary>
@@ -48,6 +55,15 @@ public IDataTemplate? ItemTemplate
             set => SetAndRaise(ItemTemplateProperty, ref _itemTemplate, value);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme
+        {
+            get { return GetValue(ItemContainerThemeProperty); }
+            set { SetValue(ItemContainerThemeProperty, value); }
+        }
+
         private Classes? _classes;
         private IEnumerable? _items;
         private IDataTemplate? _itemTemplate;
@@ -57,7 +73,8 @@ protected override Control CreatePresenter()
             return new MenuFlyoutPresenter
             {
                 [!ItemsControl.ItemsProperty] = this[!ItemsProperty],
-                [!ItemsControl.ItemTemplateProperty] = this[!ItemTemplateProperty]
+                [!ItemsControl.ItemTemplateProperty] = this[!ItemTemplateProperty],
+                [!ItemsControl.ItemContainerThemeProperty] = this[!ItemContainerThemeProperty],
             };
         }
 

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -1,5 +1,4 @@
 using System;
-using Avalonia.Controls.Generators;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;