Skip to content

Commit d4406c2

Browse files
NaBianNaBian
committed
fix: error of CornerRadius setter.
1 parent e888897 commit d4406c2

File tree

12 files changed

+45
-22
lines changed

12 files changed

+45
-22
lines changed

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Button.axaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@
375375
Value="{DynamicResource PrimaryTextBrush}" />
376376
<Setter Property="hc:BorderElement.CornerRadius"
377377
Value="0" />
378+
<Setter Property="CornerRadius"
379+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
378380
<Setter Property="Template">
379381
<ControlTemplate>
380382
<Border BorderThickness="{TemplateBinding BorderThickness}"
@@ -415,6 +417,8 @@
415417
Value="{DynamicResource PrimaryTextBrush}" />
416418
<Setter Property="hc:BorderElement.CornerRadius"
417419
Value="0" />
420+
<Setter Property="CornerRadius"
421+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
418422
<Setter Property="Padding"
419423
Value="6" />
420424
<Setter Property="Template">

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,14 @@
217217
Value="{DynamicResource TitleBrush}" />
218218
<Setter Property="hc:BorderElement.CornerRadius"
219219
Value="{StaticResource DefaultCornerRadius}" />
220+
<Setter Property="CornerRadius"
221+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
220222
<Setter Property="hc:TitleElement.Foreground"
221223
Value="{DynamicResource TextIconBrush}" />
222224
<Setter Property="Template">
223225
<ControlTemplate>
224226
<Panel Margin="8,4,8,8">
225-
<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
227+
<Border CornerRadius="{TemplateBinding CornerRadius}"
226228
BorderBrush="{TemplateBinding BorderBrush}"
227229
BorderThickness="{TemplateBinding BorderThickness}"
228230
Background="{TemplateBinding Background}"

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Expander.axaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@
177177
Value="{StaticResource DefaultControlHeight}" />
178178
<Setter Property="hc:BorderElement.CornerRadius"
179179
Value="{StaticResource DefaultCornerRadius}" />
180+
<Setter Property="CornerRadius"
181+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
180182

181183
<Style Selector="^:left">
182184
<Setter Property="Template"
@@ -200,22 +202,22 @@
200202

201203
<Style Selector="^[IsExpanded=True]">
202204
<Style Selector="^:left /template/ ToggleButton">
203-
<Setter Property="hc:BorderElement.CornerRadius"
205+
<Setter Property="CornerRadius"
204206
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}">
205207
</Setter>
206208
</Style>
207209
<Style Selector="^:up /template/ ToggleButton">
208-
<Setter Property="hc:BorderElement.CornerRadius"
210+
<Setter Property="CornerRadius"
209211
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}">
210212
</Setter>
211213
</Style>
212214
<Style Selector="^:right /template/ ToggleButton">
213-
<Setter Property="hc:BorderElement.CornerRadius"
215+
<Setter Property="CornerRadius"
214216
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}">
215217
</Setter>
216218
</Style>
217219
<Style Selector="^:down /template/ ToggleButton">
218-
<Setter Property="hc:BorderElement.CornerRadius"
220+
<Setter Property="CornerRadius"
219221
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}">
220222
</Setter>
221223
</Style>
@@ -231,7 +233,7 @@
231233

232234
<Style Selector="^[IsExpanded=False]">
233235
<Style Selector="^ /template/ ToggleButton">
234-
<Setter Property="hc:BorderElement.CornerRadius"
236+
<Setter Property="CornerRadius"
235237
Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,1,1'}">
236238
</Setter>
237239
</Style>

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Label.axaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ResourceDictionary xmlns="https://github.com/avaloniaui"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:hc="clr-namespace:HandyControl.Controls">
34
<ControlTheme x:Key="LabelBaseStyle"
45
TargetType="Label">
56
<Setter Property="Foreground"
@@ -8,8 +9,10 @@
89
Value="{DynamicResource RegionBrush}" />
910
<Setter Property="BorderBrush"
1011
Value="{DynamicResource BorderBrush}" />
11-
<Setter Property="CornerRadius"
12+
<Setter Property="hc:BorderElement.CornerRadius"
1213
Value="{StaticResource DefaultCornerRadius}" />
14+
<Setter Property="CornerRadius"
15+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
1316
<Setter Property="Padding"
1417
Value="{StaticResource DefaultControlPadding}" />
1518
<Setter Property="HorizontalContentAlignment"

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/ListBox.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
Value="{DynamicResource BorderBrush}" />
6161
<Setter Property="BorderThickness"
6262
Value="1" />
63+
<Setter Property="hc:BorderElement.CornerRadius"
64+
Value="{StaticResource DefaultCornerRadius}" />
6365
<Setter Property="CornerRadius"
6466
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
6567
<Setter Property="Padding"
@@ -72,8 +74,6 @@
7274
Value="True" />
7375
<Setter Property="ItemContainerTheme"
7476
Value="{StaticResource ListBoxItemBaseStyle}" />
75-
<Setter Property="hc:BorderElement.CornerRadius"
76-
Value="{StaticResource DefaultCornerRadius}" />
7777
<Setter Property="Template">
7878
<ControlTemplate>
7979
<Border BorderBrush="{TemplateBinding BorderBrush}"

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
TargetType="ProgressBar">
66
<Setter Property="hc:BorderElement.CornerRadius"
77
Value="{StaticResource DefaultCornerRadius}" />
8+
<Setter Property="CornerRadius"
9+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
810
<Setter Property="Background"
911
Value="{DynamicResource SecondaryRegionBrush}" />
1012
<Setter Property="BorderBrush"
@@ -14,7 +16,7 @@
1416
<Setter Property="Template">
1517
<ControlTemplate>
1618
<Border Theme="{StaticResource BorderClip}"
17-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
19+
CornerRadius="{TemplateBinding CornerRadius}"
1820
BorderBrush="{TemplateBinding BorderBrush}"
1921
BorderThickness="{TemplateBinding BorderThickness}"
2022
Background="{TemplateBinding Background}">

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/RadioButton.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@
158158
Value="{DynamicResource PrimaryTextBrush}" />
159159
<Setter Property="hc:BorderElement.CornerRadius"
160160
Value="0" />
161+
<Setter Property="CornerRadius"
162+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
161163
<Setter Property="hc:VisualElement.HighlightBrush"
162164
Value="{DynamicResource PrimaryBrush}" />
163165
<Setter Property="Template">

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/RepeatButton.axaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@
375375
Value="{DynamicResource PrimaryTextBrush}" />
376376
<Setter Property="hc:BorderElement.CornerRadius"
377377
Value="0" />
378+
<Setter Property="CornerRadius"
379+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
378380
<Setter Property="Template">
379381
<ControlTemplate>
380382
<Border BorderThickness="{TemplateBinding BorderThickness}"
@@ -415,6 +417,8 @@
415417
Value="{DynamicResource PrimaryTextBrush}" />
416418
<Setter Property="hc:BorderElement.CornerRadius"
417419
Value="0" />
420+
<Setter Property="CornerRadius"
421+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
418422
<Setter Property="Padding"
419423
Value="6" />
420424
<Setter Property="Template">

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
<ControlTheme x:Key="TabItemCapsuleHorizontalFirst"
254254
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
255255
TargetType="TabItem">
256-
<Setter Property="hc:BorderElement.CornerRadius"
256+
<Setter Property="CornerRadius"
257257
Value="4,0,0,4" />
258258
<Setter Property="Margin"
259259
Value="0" />
@@ -262,21 +262,21 @@
262262
<ControlTheme x:Key="TabItemCapsuleHorizontalLast"
263263
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
264264
TargetType="TabItem">
265-
<Setter Property="hc:BorderElement.CornerRadius"
265+
<Setter Property="CornerRadius"
266266
Value="0,4,4,0" />
267267
</ControlTheme>
268268

269269
<ControlTheme x:Key="TabItemCapsuleSingle"
270270
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
271271
TargetType="TabItem">
272-
<Setter Property="hc:BorderElement.CornerRadius"
272+
<Setter Property="CornerRadius"
273273
Value="{StaticResource DefaultCornerRadius}" />
274274
</ControlTheme>
275275

276276
<ControlTheme x:Key="TabItemCapsuleVerticalFirst"
277277
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
278278
TargetType="TabItem">
279-
<Setter Property="hc:BorderElement.CornerRadius"
279+
<Setter Property="CornerRadius"
280280
Value="4,4,0,0" />
281281
<Setter Property="Margin"
282282
Value="0" />
@@ -285,7 +285,7 @@
285285
<ControlTheme x:Key="TabItemCapsuleVerticalLast"
286286
BasedOn="{StaticResource TabItemCapsuleBaseStyle}"
287287
TargetType="TabItem">
288-
<Setter Property="hc:BorderElement.CornerRadius"
288+
<Setter Property="CornerRadius"
289289
Value="0,0,4,4" />
290290
</ControlTheme>
291291

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/TextBox.axaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
Value="Left" />
1414
<Setter Property="hc:BorderElement.CornerRadius"
1515
Value="{StaticResource DefaultCornerRadius}" />
16+
<Setter Property="CornerRadius"
17+
Value="{Binding $self.(hc:BorderElement.CornerRadius)}" />
1618
<Setter Property="MinHeight"
1719
Value="{StaticResource DefaultControlHeight}" />
1820
<Setter Property="Padding"
@@ -42,7 +44,7 @@
4244
<DataValidationErrors>
4345
<Panel>
4446
<Border x:Name="border"
45-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
47+
CornerRadius="{TemplateBinding CornerRadius}"
4648
BorderBrush="{TemplateBinding BorderBrush}"
4749
BorderThickness="{TemplateBinding BorderThickness}"
4850
Background="{TemplateBinding Background}" />
@@ -132,7 +134,7 @@
132134
<Grid ColumnDefinitions="*,Auto">
133135
<Border x:Name="border"
134136
Grid.ColumnSpan="2"
135-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
137+
CornerRadius="{TemplateBinding CornerRadius}"
136138
BorderBrush="{TemplateBinding BorderBrush}"
137139
BorderThickness="{TemplateBinding BorderThickness}"
138140
Background="{TemplateBinding Background}" />
@@ -230,7 +232,7 @@
230232
<Grid ColumnDefinitions="*,Auto">
231233
<Border x:Name="border"
232234
Grid.ColumnSpan="2"
233-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
235+
CornerRadius="{TemplateBinding CornerRadius}"
234236
BorderBrush="{TemplateBinding BorderBrush}"
235237
BorderThickness="{TemplateBinding BorderThickness}"
236238
Background="{TemplateBinding Background}" />

0 commit comments

Comments
 (0)