From bef55df65b02077c3437708095b0f8705f64bb50 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 9 Feb 2023 22:43:55 +0800
Subject: [PATCH] fix: simplify checkbox layout.

---
 src/Semi.Avalonia/Controls/CheckBox.axaml     | 26 +++++++------------
 src/Semi.Avalonia/Themes/Dark/CheckBox.axaml  |  5 ++++
 src/Semi.Avalonia/Themes/Light/CheckBox.axaml |  8 +++++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml
index 8386807..9bab81d 100644
--- a/src/Semi.Avalonia/Controls/CheckBox.axaml
+++ b/src/Semi.Avalonia/Controls/CheckBox.axaml
@@ -36,18 +36,12 @@
                             BorderThickness="{DynamicResource CheckboxBoxBorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
                             UseLayoutRounding="False" />
+                        <PathIcon
+                            Name="CheckGlyph"
+                            Width="{DynamicResource CheckboxBoxGlyphWidth}"
+                            Height="{DynamicResource CheckboxBoxGlyphHeight}"
+                            Foreground="{DynamicResource CheckboxGlyphFill}" />
 
-                        <Viewbox Height="{DynamicResource CheckboxBoxWidth}" UseLayoutRounding="False">
-                            <Panel>
-                                <Panel Width="{DynamicResource CheckboxBoxWidth}" Height="{DynamicResource CheckboxBoxWidth}" />
-                                <Path
-                                    x:Name="CheckGlyph"
-                                    VerticalAlignment="Center"
-                                    Fill="{DynamicResource CheckboxGlyphFill}"
-                                    Opacity="0"
-                                    Stretch="Uniform" />
-                            </Panel>
-                        </Viewbox>
                     </Grid>
                     <ContentPresenter
                         x:Name="ContentPresenter"
@@ -96,9 +90,8 @@
                 <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
             </Style>
 
-            <Style Selector="^ /template/ Path#CheckGlyph">
-                <Setter Property="Data" Value="M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z" />
-                <Setter Property="Width" Value="9" />
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
                 <Setter Property="Opacity" Value="1" />
             </Style>
 
@@ -140,9 +133,8 @@
                 <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
             </Style>
 
-            <Style Selector="^ /template/ Path#CheckGlyph">
-                <Setter Property="Data" Value="M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z" />
-                <Setter Property="Width" Value="9" />
+            <Style Selector="^ /template/ PathIcon#CheckGlyph">
+                <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
                 <Setter Property="Opacity" Value="1" />
             </Style>
 
diff --git a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
index e483028..1b0f815 100644
--- a/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
@@ -30,9 +30,14 @@
     <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
     <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
     <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
+    <sys:Double x:Key="CheckboxBoxGlyphWidth">12</sys:Double>
+    <sys:Double x:Key="CheckboxBoxGlyphHeight">12</sys:Double>
     <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
 
     <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
     <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
     <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
+
+    <PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
+    <PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
index b0ceafe..b87b68c 100644
--- a/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CheckBox.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary
-    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <SolidColorBrush x:Key="CheckboxForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
@@ -29,9 +30,14 @@
     <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
     <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
     <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
+    <sys:Double x:Key="CheckboxBoxGlyphWidth">12</sys:Double>
+    <sys:Double x:Key="CheckboxBoxGlyphHeight">12</sys:Double>
     <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
 
     <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
     <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
     <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
+
+    <PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
+    <PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
 </ResourceDictionary>