chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add avalonia menu style (step2).

Browse Source
This commit is contained in:
NaBian committed 2025-09-23 23:45:25 +08:00
1 parent b6ccc7330c
commit 61464afd3f
11 files changed
+110 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Avalonia/Directory.Build.props
+1 -1
View File
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.3.4</AvaloniaVersion>
<AvaloniaVersion>11.3.6</AvaloniaVersion>
</PropertyGroup>
</Project>
src/Avalonia/HandyControl_Avalonia/Controls/Attach/MenuAttach.cs
+11 -3
View File
@@ -5,7 +5,7 @@ namespace HandyControl.Controls;
public class MenuAttach
{
public static readonly AttachedProperty<double> PopupVerticalOffsetProperty =
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, double>("PopupVerticalOffset");
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, double>("PopupVerticalOffset", inherits: true);
public static void SetPopupVerticalOffset(AvaloniaObject element, double value) =>
element.SetValue(PopupVerticalOffsetProperty, value);
@@ -14,7 +14,7 @@ public class MenuAttach
element.GetValue(PopupVerticalOffsetProperty);
public static readonly AttachedProperty<double> PopupHorizontalOffsetProperty =
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, double>("PopupHorizontalOffset");
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, double>("PopupHorizontalOffset", inherits: true);
public static void SetPopupHorizontalOffset(AvaloniaObject element, double value) =>
element.SetValue(PopupHorizontalOffsetProperty, value);
@@ -23,10 +23,18 @@ public class MenuAttach
element.GetValue(PopupHorizontalOffsetProperty);
public static readonly AttachedProperty<Thickness> ItemPaddingProperty =
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, Thickness>("ItemPadding");
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, Thickness>("ItemPadding", inherits: true);
public static void SetItemPadding(AvaloniaObject element, Thickness value) =>
element.SetValue(ItemPaddingProperty, value);
public static Thickness GetItemPadding(AvaloniaObject element) => element.GetValue(ItemPaddingProperty);
public static readonly AttachedProperty<double> ItemMinHeightProperty =
AvaloniaProperty.RegisterAttached<MenuAttach, AvaloniaObject, double>("ItemMinHeight", inherits: true);
public static void SetItemMinHeight(AvaloniaObject element, double value) =>
element.SetValue(ItemMinHeightProperty, value);
public static double GetItemMinHeight(AvaloniaObject element) => element.GetValue(ItemMinHeightProperty);
}
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ContextMenu.axaml
+11 -5
View File
@@ -6,10 +6,12 @@
TargetType="ContextMenu">
<Setter Property="hc:MenuAttach.ItemPadding"
Value="{StaticResource DefaultControlPadding}" />
<Setter Property="hc:MenuAttach.ItemMinHeight"
Value="{StaticResource DefaultControlHeight}" />
<Setter Property="hc:MenuAttach.PopupVerticalOffset"
Value="-9" />
Value="-16" />
<Setter Property="hc:MenuAttach.PopupHorizontalOffset"
Value="10" />
Value="1" />
<Setter Property="Background"
Value="{DynamicResource RegionBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
@@ -18,6 +20,8 @@
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
Value="2,2,2,0" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ContextMenu">
@@ -26,7 +30,7 @@
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding CornerRadius}"
MaxHeight="{TemplateBinding MaxHeight}"
BorderThickness="1"
BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{DynamicResource BorderBrush}">
<ScrollViewer Theme="{StaticResource ScrollViewerUpDown}"
Margin="{TemplateBinding Padding}">
@@ -49,10 +53,12 @@
TargetType="ContextMenu">
<Setter Property="hc:MenuAttach.ItemPadding"
Value="6,0" />
<Setter Property="hc:MenuAttach.ItemMinHeight"
Value="20" />
<Setter Property="hc:MenuAttach.PopupVerticalOffset"
Value="-3" />
Value="-11" />
<Setter Property="hc:MenuAttach.PopupHorizontalOffset"
Value="6" />
Value="-2" />
</ControlTheme>
</ResourceDictionary>
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Menu.axaml
+22 -12
View File
@@ -6,7 +6,9 @@
<ControlTheme x:Key="MenuItemBaseStyle"
TargetType="MenuItem">
<Setter Property="Padding"
Value="{Binding Path=(hc:MenuAttach.ItemPadding),RelativeSource={RelativeSource AncestorType=MenuBase}}" />
Value="{Binding $self.(hc:MenuAttach.ItemPadding)}" />
<Setter Property="MinHeight"
Value="{Binding $self.(hc:MenuAttach.ItemMinHeight)}" />
<Setter Property="Background"
Value="Transparent" />
<Setter Property="BorderThickness"
@@ -38,20 +40,19 @@
<ContentControl Grid.Column="0"
x:Name="PART_ToggleIconPresenter"
IsVisible="False"
Margin="3"
Width="16"
Height="16" />
Height="16"
HorizontalAlignment="Right"
VerticalAlignment="Center" />
<ContentControl Grid.Column="0"
Name="PART_IconPresenter"
Width="16"
Height="16"
Margin="3"
HorizontalAlignment="Center"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="{TemplateBinding Icon}" />
<ContentPresenter Name="PART_HeaderPresenter"
Grid.Column="1"
Margin="{TemplateBinding Padding}"
VerticalAlignment="Center"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}">
@@ -64,10 +65,11 @@
<TextBlock x:Name="PART_InputGestureText"
Grid.Column="3"
VerticalAlignment="Center"
HorizontalAlignment="Left"
Text="{TemplateBinding InputGesture, Converter={StaticResource PlatformKeyGestureConverter}}" />
<Path Name="rightArrow"
Grid.Column="4"
Margin="10,0,0,0"
Margin="0,0,10,0"
Width="10"
Height="10"
HorizontalAlignment="Left"
@@ -79,10 +81,14 @@
Name="PART_Popup"
IsLightDismissEnabled="False"
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
Placement="RightEdgeAlignedTop">
Placement="RightEdgeAlignedTop"
VerticalOffset="{Binding $self.(hc:MenuAttach.PopupVerticalOffset)}"
HorizontalOffset="{Binding $self.(hc:MenuAttach.PopupHorizontalOffset)}">
<Border Background="{DynamicResource RegionBrush}"
BorderBrush="{DynamicResource BorderBrush}"
BorderThickness="1"
Margin="8"
Effect="{StaticResource EffectShadow2}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
<ScrollViewer Theme="{StaticResource ScrollViewerUpDown}"
Margin="2,2,2,0">
@@ -112,10 +118,12 @@
TargetType="Menu">
<Setter Property="hc:MenuAttach.ItemPadding"
Value="{StaticResource DefaultControlPadding}" />
<Setter Property="hc:MenuAttach.ItemMinHeight"
Value="{StaticResource DefaultControlHeight}" />
<Setter Property="hc:MenuAttach.PopupVerticalOffset"
Value="-9" />
Value="-16" />
<Setter Property="hc:MenuAttach.PopupHorizontalOffset"
Value="10" />
Value="1" />
<Setter Property="Background"
Value="{DynamicResource RegionBrush}" />
<Setter Property="Foreground"
@@ -152,10 +160,12 @@
TargetType="Menu">
<Setter Property="hc:MenuAttach.ItemPadding"
Value="6,0" />
<Setter Property="hc:MenuAttach.ItemMinHeight"
Value="20" />
<Setter Property="hc:MenuAttach.PopupVerticalOffset"
Value="-3" />
Value="-11" />
<Setter Property="hc:MenuAttach.PopupHorizontalOffset"
Value="6" />
Value="-2" />
</ControlTheme>
</ResourceDictionary>