From 600cd302981a30fcecace21de1add045dd6ef15a Mon Sep 17 00:00:00 2001
From: polarboy <chinware@163.com>
Date: Sat, 28 Sep 2024 14:41:18 +0800
Subject: [PATCH] Fixed CheckBox Mark Size calculated Bug

---
 .../ShowCase/CheckBoxShowCase.axaml           | 200 +++++++++---------
 .../CheckBox/CheckBoxIndicator.cs             |   7 +-
 2 files changed, 106 insertions(+), 101 deletions(-)

diff --git a/samples/AtomUI.Demo.Desktop/ShowCase/CheckBoxShowCase.axaml b/samples/AtomUI.Demo.Desktop/ShowCase/CheckBoxShowCase.axaml
index d2b3de3..6fb7be8 100644
--- a/samples/AtomUI.Demo.Desktop/ShowCase/CheckBoxShowCase.axaml
+++ b/samples/AtomUI.Demo.Desktop/ShowCase/CheckBoxShowCase.axaml
@@ -21,105 +21,105 @@
             </StackPanel>
         </desktop:ShowCaseItem>
 
-        <desktop:ShowCaseItem
-            Title="Disabled"
-            Description="Disabled checkbox.">
-            <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical">
-                <atom:CheckBox IsChecked="False" IsEnabled="False">UnChecked</atom:CheckBox>
-                <atom:CheckBox IsChecked="{x:Null}" IsEnabled="False">Indeterminate</atom:CheckBox>
-                <atom:CheckBox IsChecked="True" IsEnabled="False">Checked</atom:CheckBox>
-            </StackPanel>
-        </desktop:ShowCaseItem>
-
-        <desktop:ShowCaseItem
-            Title="Controlled Checkbox"
-            Description="Communicated with other components.">
-            <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical">
-                <atom:CheckBox IsChecked="{Binding ControlledCheckBoxCheckedStatus}"
-                               IsEnabled="{Binding ControlledCheckBoxEnabledStatus}"
-                               Command="{Binding CheckBoxHandler}"
-                               Content="{Binding ControlledCheckBoxText}" />
-                <StackPanel Orientation="Horizontal" Spacing="10" Margin="0, 10, 0, 0">
-                    <atom:Button SizeType="Small" ButtonType="Primary"
-                                 x:Name="CheckStatusBtn"
-                                 Command="{Binding CheckStatusHandler}"
-                                 CommandParameter="{Binding ElementName=CheckStatusBtn}"
-                                 Text="{Binding CheckStatusBtnText}" />
-                    <atom:Button SizeType="Small" ButtonType="Primary"
-                                 x:Name="EnableStatusBtn"
-                                 CommandParameter="{Binding ElementName=EnableStatusBtn}"
-                                 Command="{Binding EnableStatusHandler}"
-                                 Text="{Binding EnableStatusBtnText}" />
-                </StackPanel>
-            </StackPanel>
-        </desktop:ShowCaseItem>
-
-        <desktop:ShowCaseItem
-            Title="Checkbox Group"
-            Description="Generate a group of checkboxes from an array.">
-            <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical">
-                <WrapPanel Margin="0, 0, 0, 10">
-                    <atom:CheckBox IsChecked="True">Apple</atom:CheckBox>
-                    <atom:CheckBox IsChecked="True">Pear</atom:CheckBox>
-                    <atom:CheckBox IsChecked="True">Orange</atom:CheckBox>
-                </WrapPanel>
-                <WrapPanel Margin="0, 0, 0, 10">
-                    <atom:CheckBox>Apple</atom:CheckBox>
-                    <atom:CheckBox IsChecked="True">Pear</atom:CheckBox>
-                    <atom:CheckBox>Orange</atom:CheckBox>
-                </WrapPanel>
-                <WrapPanel Margin="0, 0, 0, 10">
-                    <atom:CheckBox IsChecked="True" IsEnabled="False">Apple</atom:CheckBox>
-                    <atom:CheckBox IsEnabled="False">Pear</atom:CheckBox>
-                    <atom:CheckBox IsEnabled="False">Orange</atom:CheckBox>
-                </WrapPanel>
-            </StackPanel>
-        </desktop:ShowCaseItem>
-
-
-        <desktop:ShowCaseItem
-            Title="Check all"
-            Description="The indeterminate property can help you to achieve a 'check all' effect.">
-            <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Spacing="10">
-                <StackPanel>
-                    <atom:CheckBox IsChecked="{Binding CheckedAllStatus}"
-                                   Command="{Binding CheckedAllStatusHandler}">
-                        Check all
-                    </atom:CheckBox>
-                </StackPanel>
-                <WrapPanel Margin="0, 20, 0, 0">
-                    <atom:CheckBox x:Name="AppleCheckBox"
-                                   IsChecked="{Binding AppleCheckedStatus}"
-                                   Command="{Binding CheckedItemStatusHandler}"
-                                   CommandParameter="{Binding ElementName=AppleCheckBox}">
-                        Apple
-                    </atom:CheckBox>
-                    <atom:CheckBox x:Name="PearCheckBox"
-                                   IsChecked="{Binding PearCheckedStatus}"
-                                   Command="{Binding CheckedItemStatusHandler}"
-                                   CommandParameter="{Binding ElementName=PearCheckBox}">
-                        Pear
-                    </atom:CheckBox>
-                    <atom:CheckBox x:Name="OrangeCheckBox"
-                                   IsChecked="{Binding OrangeCheckedStatus}"
-                                   Command="{Binding CheckedItemStatusHandler}"
-                                   CommandParameter="{Binding ElementName=OrangeCheckBox}">
-                        Orange
-                    </atom:CheckBox>
-                </WrapPanel>
-            </StackPanel>
-        </desktop:ShowCaseItem>
-
-        <desktop:ShowCaseItem
-            Title="Use with Grid"
-            Description="We can use Checkbox and Grid in Checkbox.Group, to implement complex layout.">
-            <Grid ColumnDefinitions="*,*,*" RowDefinitions="Auto,Auto,Auto" Margin="10">
-                <atom:CheckBox Grid.Row="0" Grid.Column="0">A</atom:CheckBox>
-                <atom:CheckBox Grid.Row="0" Grid.Column="1">B</atom:CheckBox>
-                <atom:CheckBox Grid.Row="0" Grid.Column="2">C</atom:CheckBox>
-                <atom:CheckBox Grid.Row="1" Grid.Column="0">D</atom:CheckBox>
-                <atom:CheckBox Grid.Row="1" Grid.Column="1">D</atom:CheckBox>
-            </Grid>
-        </desktop:ShowCaseItem>
+        <!-- <desktop:ShowCaseItem -->
+        <!--     Title="Disabled" -->
+        <!--     Description="Disabled checkbox."> -->
+        <!--     <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical"> -->
+        <!--         <atom:CheckBox IsChecked="False" IsEnabled="False">UnChecked</atom:CheckBox> -->
+        <!--         <atom:CheckBox IsChecked="{x:Null}" IsEnabled="False">Indeterminate</atom:CheckBox> -->
+        <!--         <atom:CheckBox IsChecked="True" IsEnabled="False">Checked</atom:CheckBox> -->
+        <!--     </StackPanel> -->
+        <!-- </desktop:ShowCaseItem> -->
+        <!-- -->
+        <!-- <desktop:ShowCaseItem -->
+        <!--     Title="Controlled Checkbox" -->
+        <!--     Description="Communicated with other components."> -->
+        <!--     <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical"> -->
+        <!--         <atom:CheckBox IsChecked="{Binding ControlledCheckBoxCheckedStatus}" -->
+        <!--                        IsEnabled="{Binding ControlledCheckBoxEnabledStatus}" -->
+        <!--                        Command="{Binding CheckBoxHandler}" -->
+        <!--                        Content="{Binding ControlledCheckBoxText}" /> -->
+        <!--         <StackPanel Orientation="Horizontal" Spacing="10" Margin="0, 10, 0, 0"> -->
+        <!--             <atom:Button SizeType="Small" ButtonType="Primary" -->
+        <!--                          x:Name="CheckStatusBtn" -->
+        <!--                          Command="{Binding CheckStatusHandler}" -->
+        <!--                          CommandParameter="{Binding ElementName=CheckStatusBtn}" -->
+        <!--                          Text="{Binding CheckStatusBtnText}" /> -->
+        <!--             <atom:Button SizeType="Small" ButtonType="Primary" -->
+        <!--                          x:Name="EnableStatusBtn" -->
+        <!--                          CommandParameter="{Binding ElementName=EnableStatusBtn}" -->
+        <!--                          Command="{Binding EnableStatusHandler}" -->
+        <!--                          Text="{Binding EnableStatusBtnText}" /> -->
+        <!--         </StackPanel> -->
+        <!--     </StackPanel> -->
+        <!-- </desktop:ShowCaseItem> -->
+        <!-- -->
+        <!-- <desktop:ShowCaseItem -->
+        <!--     Title="Checkbox Group" -->
+        <!--     Description="Generate a group of checkboxes from an array."> -->
+        <!--     <StackPanel HorizontalAlignment="Left" Spacing="10" Orientation="Vertical"> -->
+        <!--         <WrapPanel Margin="0, 0, 0, 10"> -->
+        <!--             <atom:CheckBox IsChecked="True">Apple</atom:CheckBox> -->
+        <!--             <atom:CheckBox IsChecked="True">Pear</atom:CheckBox> -->
+        <!--             <atom:CheckBox IsChecked="True">Orange</atom:CheckBox> -->
+        <!--         </WrapPanel> -->
+        <!--         <WrapPanel Margin="0, 0, 0, 10"> -->
+        <!--             <atom:CheckBox>Apple</atom:CheckBox> -->
+        <!--             <atom:CheckBox IsChecked="True">Pear</atom:CheckBox> -->
+        <!--             <atom:CheckBox>Orange</atom:CheckBox> -->
+        <!--         </WrapPanel> -->
+        <!--         <WrapPanel Margin="0, 0, 0, 10"> -->
+        <!--             <atom:CheckBox IsChecked="True" IsEnabled="False">Apple</atom:CheckBox> -->
+        <!--             <atom:CheckBox IsEnabled="False">Pear</atom:CheckBox> -->
+        <!--             <atom:CheckBox IsEnabled="False">Orange</atom:CheckBox> -->
+        <!--         </WrapPanel> -->
+        <!--     </StackPanel> -->
+        <!-- </desktop:ShowCaseItem> -->
+        <!-- -->
+        <!-- -->
+        <!-- <desktop:ShowCaseItem -->
+        <!--     Title="Check all" -->
+        <!--     Description="The indeterminate property can help you to achieve a 'check all' effect."> -->
+        <!--     <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Spacing="10"> -->
+        <!--         <StackPanel> -->
+        <!--             <atom:CheckBox IsChecked="{Binding CheckedAllStatus}" -->
+        <!--                            Command="{Binding CheckedAllStatusHandler}"> -->
+        <!--                 Check all -->
+        <!--             </atom:CheckBox> -->
+        <!--         </StackPanel> -->
+        <!--         <WrapPanel Margin="0, 20, 0, 0"> -->
+        <!--             <atom:CheckBox x:Name="AppleCheckBox" -->
+        <!--                            IsChecked="{Binding AppleCheckedStatus}" -->
+        <!--                            Command="{Binding CheckedItemStatusHandler}" -->
+        <!--                            CommandParameter="{Binding ElementName=AppleCheckBox}"> -->
+        <!--                 Apple -->
+        <!--             </atom:CheckBox> -->
+        <!--             <atom:CheckBox x:Name="PearCheckBox" -->
+        <!--                            IsChecked="{Binding PearCheckedStatus}" -->
+        <!--                            Command="{Binding CheckedItemStatusHandler}" -->
+        <!--                            CommandParameter="{Binding ElementName=PearCheckBox}"> -->
+        <!--                 Pear -->
+        <!--             </atom:CheckBox> -->
+        <!--             <atom:CheckBox x:Name="OrangeCheckBox" -->
+        <!--                            IsChecked="{Binding OrangeCheckedStatus}" -->
+        <!--                            Command="{Binding CheckedItemStatusHandler}" -->
+        <!--                            CommandParameter="{Binding ElementName=OrangeCheckBox}"> -->
+        <!--                 Orange -->
+        <!--             </atom:CheckBox> -->
+        <!--         </WrapPanel> -->
+        <!--     </StackPanel> -->
+        <!-- </desktop:ShowCaseItem> -->
+        <!-- -->
+        <!-- <desktop:ShowCaseItem -->
+        <!--     Title="Use with Grid" -->
+        <!--     Description="We can use Checkbox and Grid in Checkbox.Group, to implement complex layout."> -->
+        <!--     <Grid ColumnDefinitions="*,*,*" RowDefinitions="Auto,Auto,Auto" Margin="10"> -->
+        <!--         <atom:CheckBox Grid.Row="0" Grid.Column="0">A</atom:CheckBox> -->
+        <!--         <atom:CheckBox Grid.Row="0" Grid.Column="1">B</atom:CheckBox> -->
+        <!--         <atom:CheckBox Grid.Row="0" Grid.Column="2">C</atom:CheckBox> -->
+        <!--         <atom:CheckBox Grid.Row="1" Grid.Column="0">D</atom:CheckBox> -->
+        <!--         <atom:CheckBox Grid.Row="1" Grid.Column="1">D</atom:CheckBox> -->
+        <!--     </Grid> -->
+        <!-- </desktop:ShowCaseItem> -->
     </desktop:ShowCasePanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
index 607f060..f8d8313 100644
--- a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
+++ b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
@@ -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()