From 0a792a5964b1c78557834294ad76535d2c15beb5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 25 Sep 2025 22:15:18 +0800
Subject: [PATCH] feat: add avalonia menu style (step3).

---
 .../Themes/Styles/ContextMenu.axaml           |  4 +-
 .../Themes/Styles/Menu.axaml                  | 29 +++++++++++-
 .../Themes/Styles/MenuFlyoutPresenter.axaml   | 47 +++++++++++++++++++
 .../HandyControl_Avalonia/Themes/Theme.axaml  |  1 +
 .../HandyControl_Net_40/Themes/Theme.xaml     |  2 +-
 .../Themes/Styles/Base/MenuBaseStyle.xaml     |  2 +-
 .../HandyControl_Shared/Themes/Theme.xaml     |  2 +-
 7 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 src/Avalonia/HandyControl_Avalonia/Themes/Styles/MenuFlyoutPresenter.axaml

diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ContextMenu.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ContextMenu.axaml
index 621ede76..734d69be 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ContextMenu.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ContextMenu.axaml
@@ -14,6 +14,8 @@
                 Value="1" />
         <Setter Property="Background"
                 Value="{DynamicResource RegionBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BorderBrush}" />
         <Setter Property="hc:BorderElement.CornerRadius"
                 Value="{StaticResource DefaultCornerRadius}" />
         <Setter Property="CornerRadius"
@@ -31,7 +33,7 @@
                             CornerRadius="{TemplateBinding CornerRadius}"
                             MaxHeight="{TemplateBinding MaxHeight}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{DynamicResource BorderBrush}">
+                            BorderBrush="{TemplateBinding BorderBrush}">
                         <ScrollViewer Theme="{StaticResource ScrollViewerUpDown}"
                                       Margin="{TemplateBinding Padding}">
                             <ItemsPresenter Name="PART_ItemsPresenter"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Menu.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Menu.axaml
index 1a27fca6..f57ccd9a 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Menu.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/Menu.axaml
@@ -11,6 +11,8 @@
                 Value="{Binding $self.(hc:MenuAttach.ItemMinHeight)}" />
         <Setter Property="Background"
                 Value="Transparent" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BorderBrush}" />
         <Setter Property="BorderThickness"
                 Value="0" />
         <Setter Property="Foreground"
@@ -42,12 +44,14 @@
                                         IsVisible="False"
                                         Width="16"
                                         Height="16"
+                                        Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center" />
                         <ContentControl Grid.Column="0"
                                         Name="PART_IconPresenter"
                                         Width="16"
                                         Height="16"
+                                        Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
                                         VerticalAlignment="Center"
                                         Content="{TemplateBinding Icon}" />
@@ -66,6 +70,8 @@
                                    Grid.Column="3"
                                    VerticalAlignment="Center"
                                    HorizontalAlignment="Left"
+                                   Margin="0,0,10,0"
+                                   IsVisible="False"
                                    Text="{TemplateBinding InputGesture, Converter={StaticResource PlatformKeyGestureConverter}}" />
                         <Path Name="rightArrow"
                               Grid.Column="4"
@@ -108,7 +114,28 @@
                     Value="{DynamicResource SecondaryRegionBrush}" />
         </Style>
 
-        <Style Selector="^:empty /template/ Path#rightArrow">
+        <Style Selector="^:empty">
+            <Style Selector="^ /template/Path#rightArrow">
+                <Setter Property="IsVisible"
+                        Value="False" />
+            </Style>
+            <Style Selector="^ /template/TextBlock#PART_InputGestureText">
+                <Setter Property="IsVisible"
+                        Value="True" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Setter Property="Opacity"
+                    Value="0.4" />
+        </Style>
+
+        <Style Selector="^:toggle /template/ ContentControl#PART_ToggleIconPresenter, ^:radio /template/ ContentControl#PART_ToggleIconPresenter">
+            <Setter Property="IsVisible"
+                    Value="True" />
+        </Style>
+
+        <Style Selector="^:toggle /template/ ContentPresenter#PART_IconPresenter, ^:radio /template/ ContentPresenter#PART_IconPresenter">
             <Setter Property="IsVisible"
                     Value="False" />
         </Style>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MenuFlyoutPresenter.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MenuFlyoutPresenter.axaml
new file mode 100644
index 00000000..c5699769
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/MenuFlyoutPresenter.axaml
@@ -0,0 +1,47 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:hc="https://handyorg.github.io/handycontrol">
+
+    <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}"
+                  TargetType="MenuFlyoutPresenter">
+        <Setter Property="hc:MenuAttach.ItemPadding"
+                Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="hc:MenuAttach.ItemMinHeight"
+                Value="{StaticResource DefaultControlHeight}" />
+        <Setter Property="hc:MenuAttach.PopupVerticalOffset"
+                Value="-16" />
+        <Setter Property="hc:MenuAttach.PopupHorizontalOffset"
+                Value="1" />
+        <Setter Property="Background"
+                Value="{DynamicResource RegionBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BorderBrush}" />
+        <Setter Property="hc:BorderElement.CornerRadius"
+                Value="{StaticResource DefaultCornerRadius}" />
+        <Setter Property="CornerRadius"
+                Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
+        <Setter Property="Padding"
+                Value="2,2,2,0" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Effect="{StaticResource EffectShadow2}"
+                        Margin="8"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        MaxHeight="{TemplateBinding MaxHeight}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderBrush="{TemplateBinding BorderBrush}">
+                    <ScrollViewer Theme="{StaticResource ScrollViewerUpDown}"
+                                  Margin="{TemplateBinding Padding}">
+                        <ItemsPresenter Name="PART_ItemsPresenter"
+                                        ItemsPanel="{TemplateBinding ItemsPanel}"
+                                        KeyboardNavigation.TabNavigation="Continue" />
+                    </ScrollViewer>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
index 8e974b31..ce69a3bb 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
@@ -16,6 +16,7 @@
                 <MergeResourceInclude Source="/Themes/Basic/Converters.axaml" />
 
                 <MergeResourceInclude Source="/Themes/Styles/DataValidationErrors.axaml" />
+                <MergeResourceInclude Source="/Themes/Styles/MenuFlyoutPresenter.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/PopupRoot.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/ToolTip.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/TextBlock.axaml" />
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index fdf08db5..3eb77c18 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -6353,7 +6353,7 @@
 								<ColumnDefinition Width="20" />
 							</Grid.ColumnDefinitions>
 							<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="Red" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
 								<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
 							</Border>
 							<ContentPresenter Grid.Column="1" x:Name="ContentPresenter" VerticalAlignment="Center" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
index 28ac08be..6f883ba9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
@@ -27,7 +27,7 @@
                                 <ColumnDefinition Width="20"/>
                             </Grid.ColumnDefinitions>
                             <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
-                            <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="Red" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+                            <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
                                 <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
                             </Border>
                             <ContentPresenter Grid.Column="1" x:Name="ContentPresenter" VerticalAlignment="Center" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 9e93de83..83a0ed14 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -6437,7 +6437,7 @@
 								<ColumnDefinition Width="20" />
 							</Grid.ColumnDefinitions>
 							<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="Red" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
 								<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
 							</Border>
 							<ContentPresenter Grid.Column="1" x:Name="ContentPresenter" VerticalAlignment="Center" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />