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

fix: error of CornerRadius setter.

Browse Source
This commit is contained in:
NaBian committed 2025-08-21 21:54:32 +08:00
1 parent e888897bf4
commit d4406c2888
12 files changed
+45 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Avalonia/HandyControl_Avalonia/Themes/Styles/Button.axaml
+4
View File
@@ -375,6 +375,8 @@
Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="0" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Template">
<ControlTemplate>
<Border BorderThickness="{TemplateBinding BorderThickness}"
@@ -415,6 +417,8 @@
Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="0" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
Value="6" />
<Setter Property="Template">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml
+3 -1
View File
@@ -217,12 +217,14 @@
Value="{DynamicResource TitleBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="hc:TitleElement.Foreground"
Value="{DynamicResource TextIconBrush}" />
<Setter Property="Template">
<ControlTemplate>
<Panel Margin="8,4,8,8">
<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
<Border CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Expander.axaml
+7 -5
View File
@@ -177,6 +177,8 @@
Value="{StaticResource DefaultControlHeight}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Style Selector="^:left">
<Setter Property="Template"
@@ -200,22 +202,22 @@
<Style Selector="^[IsExpanded=True]">
<Style Selector="^:left /template/ ToggleButton">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}">
</Setter>
</Style>
<Style Selector="^:up /template/ ToggleButton">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}">
</Setter>
</Style>
<Style Selector="^:right /template/ ToggleButton">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}">
</Setter>
</Style>
<Style Selector="^:down /template/ ToggleButton">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}">
</Setter>
</Style>
@@ -231,7 +233,7 @@
<Style Selector="^[IsExpanded=False]">
<Style Selector="^ /template/ ToggleButton">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,1,1'}">
</Setter>
</Style>
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Label.axaml
+5 -2
View File
@@ -1,5 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="clr-namespace:HandyControl.Controls">
<ControlTheme x:Key="LabelBaseStyle"
TargetType="Label">
<Setter Property="Foreground"
@@ -8,8 +9,10 @@
Value="{DynamicResource RegionBrush}" />
<Setter Property="BorderBrush"
Value="{DynamicResource BorderBrush}" />
<Setter Property="CornerRadius"
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
Value="{StaticResource DefaultControlPadding}" />
<Setter Property="HorizontalContentAlignment"
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ListBox.axaml
+2 -2
View File
@@ -60,6 +60,8 @@
Value="{DynamicResource BorderBrush}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
@@ -72,8 +74,6 @@
Value="True" />
<Setter Property="ItemContainerTheme"
Value="{StaticResource ListBoxItemBaseStyle}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="Template">
<ControlTemplate>
<Border BorderBrush="{TemplateBinding BorderBrush}"
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
+3 -1
View File
@@ -5,6 +5,8 @@
TargetType="ProgressBar">
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Background"
Value="{DynamicResource SecondaryRegionBrush}" />
<Setter Property="BorderBrush"
@@ -14,7 +16,7 @@
<Setter Property="Template">
<ControlTemplate>
<Border Theme="{StaticResource BorderClip}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/RadioButton.axaml
+2
View File
@@ -158,6 +158,8 @@
Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="0" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="hc:VisualElement.HighlightBrush"
Value="{DynamicResource PrimaryBrush}" />
<Setter Property="Template">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/RepeatButton.axaml
+4
View File
@@ -375,6 +375,8 @@
Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="0" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Template">
<ControlTemplate>
<Border BorderThickness="{TemplateBinding BorderThickness}"
@@ -415,6 +417,8 @@
Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="0" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
Value="6" />
<Setter Property="Template">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml
+5 -5
View File
@@ -253,7 +253,7 @@
<ControlTheme x:Key="TabItemCapsuleHorizontalFirst"
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
TargetType="TabItem">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="4,0,0,4" />
<Setter Property="Margin"
Value="0" />
@@ -262,21 +262,21 @@
<ControlTheme x:Key="TabItemCapsuleHorizontalLast"
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
TargetType="TabItem">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="0,4,4,0" />
</ControlTheme>
<ControlTheme x:Key="TabItemCapsuleSingle"
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
TargetType="TabItem">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
</ControlTheme>
<ControlTheme x:Key="TabItemCapsuleVerticalFirst"
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
TargetType="TabItem">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="4,4,0,0" />
<Setter Property="Margin"
Value="0" />
@@ -285,7 +285,7 @@
<ControlTheme x:Key="TabItemCapsuleVerticalLast"
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
TargetType="TabItem">
<Setter Property="hc:BorderElement.CornerRadius"
<Setter Property="CornerRadius"
Value="0,0,4,4" />
</ControlTheme>
src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml
+5 -3
View File
@@ -13,6 +13,8 @@
Value="Left" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="MinHeight"
Value="{StaticResource DefaultControlHeight}" />
<Setter Property="Padding"
@@ -42,7 +44,7 @@
<DataValidationErrors>
<Panel>
<Border x:Name="border"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}" />
@@ -132,7 +134,7 @@
<Grid ColumnDefinitions="*,Auto">
<Border x:Name="border"
Grid.ColumnSpan="2"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}" />
@@ -230,7 +232,7 @@
<Grid ColumnDefinitions="*,Auto">
<Border x:Name="border"
Grid.ColumnSpan="2"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}" />
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
+3 -1
View File
@@ -17,6 +17,8 @@
Value="12" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Template">
<ControlTemplate>
<ContentPresenter Name="PART_ContentPresenter"
@@ -25,7 +27,7 @@
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
src/Avalonia/HandyControl_Avalonia/Themes/Styles/TreeView.axaml
+2 -2
View File
@@ -128,6 +128,8 @@
Value="{DynamicResource BorderBrush}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="CornerRadius"
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
<Setter Property="Padding"
@@ -140,8 +142,6 @@
Value="True" />
<Setter Property="ItemContainerTheme"
Value="{StaticResource TreeViewItemBaseStyle}" />
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="Template">
<ControlTemplate>
<Border BorderBrush="{TemplateBinding BorderBrush}"