From b1a133ce80add68d7788e7fb170e5aaecc5e1797 Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Fri, 24 May 2024 10:44:43 +0800
Subject: [PATCH] Add `ItemMinWidth` and `TopLevelMinWidth` for `MenuAttach`.

---
 .../UserControl/Styles/MenuDemoCtl.xaml       | 130 +++++++++++++-----
 .../Controls/Attach/MenuAttach.cs             |  14 ++
 .../HandyControl_Shared/Data/ValueBoxes.cs    |   4 +
 .../Themes/Styles/Base/MenuBaseStyle.xaml     |   6 +-
 4 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
index 6b4a12371..305ef751b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml
@@ -6,39 +6,101 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="16" Margin="32">
-            <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
-                <hc:DashedBorder.ContextMenu>
-                    <ContextMenu ItemsSource="{Binding DataList}">
-                        <ContextMenu.ItemTemplate>
-                            <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
-                                <TextBlock Text="{Binding Name}" />
-                            </HierarchicalDataTemplate>
-                        </ContextMenu.ItemTemplate>
-                    </ContextMenu>
-                </hc:DashedBorder.ContextMenu>
-                <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
-                    <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}"/>
-                    <LineBreak />
-                    <Run Text="Default" />
-                </TextBlock>
-            </hc:DashedBorder>
-            <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
-                <hc:DashedBorder.ContextMenu>
-                    <ContextMenu ItemsSource="{Binding DataList}" Style="{StaticResource ContextMenu.Small}">
-                        <ContextMenu.ItemTemplate>
-                            <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
-                                <TextBlock Text="{Binding Name}" />
-                            </HierarchicalDataTemplate>
-                        </ContextMenu.ItemTemplate>
-                    </ContextMenu>
-                </hc:DashedBorder.ContextMenu>
-                <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
-                    <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}" />
-                    <LineBreak />
-                    <Run Text="Small" />
-                </TextBlock>
-            </hc:DashedBorder>
-        </hc:UniformSpacingPanel>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <Menu Grid.Row="0" ItemsSource="{Binding DataList}" Margin="32">
+                <Menu.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                        <TextBlock Text="{Binding Name}" />
+                    </HierarchicalDataTemplate>
+                </Menu.ItemTemplate>
+            </Menu>
+
+            <Menu Grid.Row="1" ItemsSource="{Binding DataList}" Margin="32"
+                  hc:MenuAttach.TopLevelMinWidth="100" hc:MenuAttach.ItemMinWidth="0">
+                <Menu.ItemTemplate>
+                    <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                        <TextBlock Text="{Binding Name}" />
+                    </HierarchicalDataTemplate>
+                </Menu.ItemTemplate>
+            </Menu>
+
+            <hc:UniformSpacingPanel Spacing="16" Margin="32" Grid.Row="2">
+                
+                <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
+                    <hc:DashedBorder.ContextMenu>
+                        <ContextMenu ItemsSource="{Binding DataList}">
+                            <ContextMenu.ItemTemplate>
+                                <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                                    <TextBlock Text="{Binding Name}" />
+                                </HierarchicalDataTemplate>
+                            </ContextMenu.ItemTemplate>
+                        </ContextMenu>
+                    </hc:DashedBorder.ContextMenu>
+                    <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
+                        <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}"/>
+                        <LineBreak />
+                        <Run Text="Default" />
+                    </TextBlock>
+                </hc:DashedBorder>
+                <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
+                    <hc:DashedBorder.ContextMenu>
+                        <ContextMenu ItemsSource="{Binding DataList}" Style="{StaticResource ContextMenu.Small}">
+                            <ContextMenu.ItemTemplate>
+                                <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                                    <TextBlock Text="{Binding Name}" />
+                                </HierarchicalDataTemplate>
+                            </ContextMenu.ItemTemplate>
+                        </ContextMenu>
+                    </hc:DashedBorder.ContextMenu>
+                    <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
+                        <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}" />
+                        <LineBreak />
+                        <Run Text="Small" />
+                    </TextBlock>
+                </hc:DashedBorder>
+                <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
+                    <hc:DashedBorder.ContextMenu>
+                        <ContextMenu ItemsSource="{Binding DataList}" hc:MenuAttach.ItemMinWidth="0">
+                            <ContextMenu.ItemTemplate>
+                                <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                                    <TextBlock Text="{Binding Name}" />
+                                </HierarchicalDataTemplate>
+                            </ContextMenu.ItemTemplate>
+                        </ContextMenu>
+                    </hc:DashedBorder.ContextMenu>
+                    <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
+                        <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}"/>
+                        <LineBreak />
+                        <Run Text="Default" />
+                        <LineBreak />
+                        <Run Text="ItemMinWidth" />
+                    </TextBlock>
+                </hc:DashedBorder>
+                <hc:DashedBorder Width="200" Height="112" Background="Transparent" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" BorderDashArray="2,2">
+                    <hc:DashedBorder.ContextMenu>
+                        <ContextMenu ItemsSource="{Binding DataList}" hc:MenuAttach.ItemMinWidth="0" Style="{StaticResource ContextMenu.Small}">
+                            <ContextMenu.ItemTemplate>
+                                <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
+                                    <TextBlock Text="{Binding Name}" />
+                                </HierarchicalDataTemplate>
+                            </ContextMenu.ItemTemplate>
+                        </ContextMenu>
+                    </hc:DashedBorder.ContextMenu>
+                    <TextBlock Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}" TextAlignment="Center">
+                        <Run Text="{ex:Lang Key={x:Static langs:LangKeys.RightClickHere}}" />
+                        <LineBreak />
+                        <Run Text="Small" />
+                        <LineBreak />
+                        <Run Text="ItemMinWidth" />
+                    </TextBlock>
+                </hc:DashedBorder>
+            </hc:UniformSpacingPanel>
+        </Grid>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/MenuAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/MenuAttach.cs
index eae15ccaf..880986fe2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/MenuAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/MenuAttach.cs
@@ -31,4 +31,18 @@ public static void SetItemPadding(DependencyObject element, Thickness value)
 
     public static Thickness GetItemPadding(DependencyObject element)
         => (Thickness) element.GetValue(ItemPaddingProperty);
+
+    public static readonly DependencyProperty ItemMinWidthProperty = DependencyProperty.RegisterAttached(
+        "ItemMinWidth", typeof(double), typeof(MenuAttach), new PropertyMetadata(ValueBoxes.Double240Box));
+
+    public static void SetItemMinWidth(DependencyObject obj, double value) => obj.SetValue(ItemMinWidthProperty, value);
+
+    public static double GetItemMinWidth(DependencyObject obj) => (double) obj.GetValue(ItemMinWidthProperty);
+
+    public static readonly DependencyProperty TopLevelMinWidthProperty = DependencyProperty.RegisterAttached(
+        "TopLevelMinWidth", typeof(double), typeof(MenuAttach), new PropertyMetadata(ValueBoxes.Double44Box));
+
+    public static void SetTopLevelMinWidth(DependencyObject obj, double value) => obj.SetValue(TopLevelMinWidthProperty, value);
+
+    public static double GetTopLevelMinWidth(DependencyObject obj) => (double) obj.GetValue(TopLevelMinWidthProperty);
 }
diff --git a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
index 28f747c2a..c41f00651 100644
--- a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
+++ b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
@@ -33,10 +33,14 @@ internal static class ValueBoxes
 
     internal static object Double20Box = 20.0;
 
+    internal static object Double44Box = 44.0;
+
     internal static object Double100Box = 100.0;
 
     internal static object Double200Box = 200.0;
 
+    internal static object Double240Box = 240.0;
+
     internal static object Double300Box = 300.0;
 
     internal static object DoubleNeg1Box = -1.0;
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
index d73cc7e14..b03b90653 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuItem">
-                    <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{Binding Path=(hc:MenuAttach.ItemMinWidth), RelativeSource={RelativeSource AncestorType=MenuBase}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="26"/>
@@ -49,7 +49,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="MenuItem">
-                            <Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <Border MinWidth="{Binding Path=(hc:MenuAttach.TopLevelMinWidth), RelativeSource={RelativeSource AncestorType=MenuBase}}" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                                 <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
@@ -147,7 +147,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="MenuItem">
-                            <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{Binding Path=(hc:MenuAttach.ItemMinWidth), RelativeSource={RelativeSource AncestorType=MenuBase}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                                 <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="26"/>