test/atomui
1
0
Fork 0
mirror of https://gitee.com/chinware/atomui.git synced 2024-11-29 18:38:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed CheckBox Mark Size calculated Bug

Browse Source
This commit is contained in:
polarboy 2024-09-28 14:41:18 +08:00
parent d0f71b4cc5
commit aeca918ce5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
View File

@ -130,7 +130,6 @@ internal class CheckBoxIndicator : Control, IWaveAdornerInfoProvider
public override void ApplyTemplate()
{
base.ApplyTemplate();
SetupIndicatorCheckedMarkEffectSize();
Transitions ??= new Transitions
{
AnimationUtils.CreateTransition<SolidColorBrushTransition>(BackgroundProperty),
@ -177,6 +176,12 @@ internal class CheckBoxIndicator : Control, IWaveAdornerInfoProvider
WaveSpiritAdorner.ShowWaveAdorner(this, WaveType.RoundRectWave);
}
}
if (e.Property == SizeProperty)
{
CollectStyleState();
SetupIndicatorCheckedMarkEffectSize();
}
}
private void SetupIndicatorCheckedMarkEffectSize()

1
src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs
View File

@ -46,6 +46,7 @@ internal class CheckBoxTheme : BaseControlTheme
{
Name = IndicatorPart
};
CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsEnabledProperty, CheckBox.IsEnabledProperty);
CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsCheckedProperty, CheckBox.IsCheckedProperty);
layout.Children.Add(indicator);

4
src/AtomUI.Controls/RadioButton/RadioButtonTheme.cs
View File

@ -47,8 +47,8 @@ internal class RadioButtonTheme : BaseControlTheme
{
Name = IndicatorPart
};
CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsCheckedProperty, RadioButton.IsCheckedProperty);
CreateTemplateParentBinding(indicator, RadioIndicator.IsEnabledProperty, RadioButton.IsEnabledProperty);
CreateTemplateParentBinding(indicator, RadioIndicator.IsCheckedProperty, RadioButton.IsCheckedProperty);
layout.Children.Add(indicator);
var contentPresenter = new ContentPresenter()