From dfcb3579b45899db44d3f6d695f5e510a745be4a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 13:00:01 +0800
Subject: [PATCH 1/3] misc: Restore &gt; to >.

---
 src/Semi.Avalonia/Controls/DatePicker.axaml   |  2 +-
 src/Semi.Avalonia/Controls/ScrollViewer.axaml | 10 +++++-----
 src/Semi.Avalonia/Controls/TabControl.axaml   |  4 ++--
 src/Semi.Avalonia/Controls/TimePicker.axaml   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 50595ee..689554a 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -26,7 +26,7 @@
                     <Grid Name="ContentPanel" RowDefinitions="*,Auto">
                         <Grid Name="PART_PickerContainer">
                             <Grid.Styles>
-                                <Style Selector="DateTimePickerPanel &gt; ListBoxItem">
+                                <Style Selector="DateTimePickerPanel > ListBoxItem">
                                     <Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" />
                                 </Style>
                             </Grid.Styles>
diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
index e68d344..431a776 100644
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -205,13 +205,13 @@
             <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
             <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
         </Style>
-        <Style Selector="^ /template/ RepeatButton &gt; PathIcon">
+        <Style Selector="^ /template/ RepeatButton > PathIcon">
             <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonDefaultForeground}" />
         </Style>
-        <Style Selector="^ /template/ RepeatButton:pointerover &gt; PathIcon">
+        <Style Selector="^ /template/ RepeatButton:pointerover > PathIcon">
             <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonPointeroverForeground}" />
         </Style>
-        <Style Selector="^ /template/ RepeatButton:pressed &gt; PathIcon">
+        <Style Selector="^ /template/ RepeatButton:pressed > PathIcon">
             <Setter Property="RenderTransform" Value="scale(0.92)" />
         </Style>
 
@@ -346,11 +346,11 @@
                 </DockPanel>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^ /template/ RepeatButton &gt; Path">
+        <Style Selector="^ /template/ RepeatButton > Path">
             <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonDefaultForeground}" />
         </Style>
 
-        <Style Selector="^ /template/ RepeatButton:pointerover &gt; Path">
+        <Style Selector="^ /template/ RepeatButton:pointerover > Path">
             <Setter Property="Fill" Value="{DynamicResource ColorScrollBarButtonPointeroverForeground}" />
         </Style>
     </ControlTheme>
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index a408fd3..58b2589 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -32,10 +32,10 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
+        <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
             <Setter Property="Orientation" Value="Vertical" />
         </Style>
-        <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
+        <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
             <Setter Property="Orientation" Value="Vertical" />
         </Style>
         <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 39a7958..00896f6 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -26,7 +26,7 @@
                     <Grid Name="ContentPanel" RowDefinitions="*,Auto">
                         <Grid Name="PART_PickerContainer">
                             <Grid.Styles>
-                                <Style Selector="DateTimePickerPanel &gt; ListBoxItem">
+                                <Style Selector="DateTimePickerPanel > ListBoxItem">
                                     <Setter Property="Theme" Value="{StaticResource DateTimePickerItem}" />
                                 </Style>
                             </Grid.Styles>

From d3f297730b9a6f826ae110f8222776e08480657b Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:46:07 +0800
Subject: [PATCH 2/3] feat: adjust ComboBox, ListBox, DatePicker & TimePicker
 item Padding.

---
 src/Semi.Avalonia/Controls/ComboBox.axaml                  | 6 ++----
 src/Semi.Avalonia/Controls/DatePicker.axaml                | 5 ++++-
 src/Semi.Avalonia/Controls/DateTimePickerShared.axaml      | 4 ----
 src/Semi.Avalonia/Controls/TimePicker.axaml                | 4 +++-
 src/Semi.Avalonia/Themes/Shared/ComboBox.axaml             | 2 +-
 src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml | 4 ++--
 src/Semi.Avalonia/Themes/Shared/ListBox.axaml              | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 6ddd0f3..2a8fc6e 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -66,8 +66,7 @@
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             TextTrimming="CharacterEllipsis"
                             Foreground="{TemplateBinding Foreground}"
-                            IsVisible="{TemplateBinding SelectionBoxItem,
-                                                        Converter={x:Static ObjectConverters.IsNull}}"
+                            IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
                             Opacity="0.3"
                             Text="{TemplateBinding PlaceholderText}" />
                         <ContentPresenter
@@ -130,11 +129,10 @@
                                 CornerRadius="6">
                                 <ScrollViewer
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                    IsDeferredScrollingEnabled="{TemplateBinding (ScrollViewer.IsDeferredScrollingEnabled)}"
+                                    IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                     VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                     <ItemsPresenter
                                         Name="PART_ItemsPresenter"
-                                        Margin="{DynamicResource ComboBoxDropdownContentMargin}"
                                         ItemsPanel="{TemplateBinding ItemsPanel}" />
                                 </ScrollViewer>
                             </Border>
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 689554a..ec4716c 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -22,7 +22,8 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True">
                     <Grid Name="ContentPanel" RowDefinitions="*,Auto">
                         <Grid Name="PART_PickerContainer">
                             <Grid.Styles>
@@ -108,6 +109,7 @@
                                     Data="{DynamicResource DateTimePickerDismissGlyph}" />
                             </Button>
                             <Rectangle
+                                Grid.Column="0"
                                 Grid.ColumnSpan="2"
                                 Height="1"
                                 VerticalAlignment="Top"
@@ -177,6 +179,7 @@
                                     <TextBlock
                                         Name="PART_MonthTextBlock"
                                         Padding="12,0"
+                                        HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
index 4db8cea..b9440fb 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -65,10 +65,6 @@
         <Style Selector="^:selected">
             <Setter Property="IsHitTestVisible" Value="False" />
         </Style>
-        <Style Selector="^.MonthItem">
-            <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}" />
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-        </Style>
     </ControlTheme>
 
     <!--  This is used for both the accept/dismiss & buttons in the presenter  -->
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 00896f6..bc95b47 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -22,7 +22,8 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True">
                     <Grid Name="ContentPanel" RowDefinitions="*,Auto">
                         <Grid Name="PART_PickerContainer">
                             <Grid.Styles>
@@ -130,6 +131,7 @@
                                     Data="{DynamicResource DateTimePickerDismissGlyph}" />
                             </Button>
                             <Rectangle
+                                Grid.Column="0"
                                 Grid.ColumnSpan="2"
                                 Height="1"
                                 VerticalAlignment="Top"
diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
index 219082e..7f0b531 100644
--- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
 
-    <Thickness x:Key="ComboBoxItemDefaultPadding">8 4</Thickness>
+    <Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
     <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
 
     <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
diff --git a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
index 532a50c..80c132d 100644
--- a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
@@ -4,10 +4,10 @@
     <StreamGeometry x:Key="DateTimePickerAcceptGlyph">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</StreamGeometry>
     <StreamGeometry x:Key="DateTimePickerDismissGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry>
 
-    <x:Double x:Key="DateTimePickerListBoxItemHeight">30</x:Double>
+    <x:Double x:Key="DateTimePickerListBoxItemHeight">36</x:Double>
 
 
-    <Thickness x:Key="DateTimePickerFlyoutPadding">16 0</Thickness>
+    <Thickness x:Key="DateTimePickerFlyoutPadding">0</Thickness>
     <Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>
 
     <x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
index a402804..371349f 100644
--- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
-    <Thickness x:Key="ListBoxItemDefaultPadding">8 4</Thickness>
+    <Thickness x:Key="ListBoxItemDefaultPadding">12 8</Thickness>
     <CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
 
 </ResourceDictionary>
\ No newline at end of file

From 3ce4067c3f2e7165c63391f240e38e906412c237 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:10:35 +0800
Subject: [PATCH 3/3] feat: extract ComboBox resources.

---
 src/Semi.Avalonia/Controls/ComboBox.axaml     | 26 +++++++------------
 .../Themes/Shared/ComboBox.axaml              |  8 ++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 2a8fc6e..760380a 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -30,11 +30,11 @@
     <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
         <Setter Property="Padding" Value="{DynamicResource ComboBoxSelectorDefaultPadding}" />
         <Setter Property="FocusAdorner" Value="{x:Null}" />
-        <Setter Property="MaxDropDownHeight" Value="504" />
+        <Setter Property="MaxDropDownHeight" Value="{DynamicResource ComboBoxPopupMaxDropDownHeight}" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxSelectorThickness}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -80,27 +80,19 @@
                         <Button
                             Name="ClearButton"
                             Grid.Column="1"
-                            Margin="0,0,8,0"
+                            Margin="{DynamicResource ComboBoxClearButtonMargin}"
                             Command="{Binding $parent[ComboBox].Clear}"
                             Content="{DynamicResource IconButtonClearData}"
                             Focusable="False"
                             IsVisible="False"
                             Theme="{DynamicResource InnerIconButton}" />
-                        <Border
-                            Name="DropDownOverlay"
-                            Grid.Column="1"
-                            Width="30"
-                            Margin="0,1,1,1"
-                            HorizontalAlignment="Right"
-                            Background="Transparent"
-                            IsVisible="False" />
 
                         <PathIcon
                             Name="DropDownGlyph"
                             Grid.Column="1"
-                            Width="12"
-                            Height="12"
-                            Margin="0,0,12,0"
+                            Width="{DynamicResource ComboBoxIconWidth}"
+                            Height="{DynamicResource ComboBoxIconHeight}"
+                            Margin="{DynamicResource ComboBoxIconMargin}"
                             Data="{DynamicResource ComboBoxIcon}"
                             Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
                             IsHitTestVisible="False"
@@ -119,14 +111,14 @@
                             WindowManagerAddShadowHint="False">
                             <Border
                                 Name="PopupBorder"
-                                Margin="0,4"
                                 HorizontalAlignment="Stretch"
+                                Margin="{DynamicResource ComboBoxPopupBorderMargin}"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
                                 BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
-                                ClipToBounds="True"
-                                CornerRadius="6">
+                                CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"
+                                ClipToBounds="True">
                                 <ScrollViewer
                                     HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                     IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
index 7f0b531..2930b5f 100644
--- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -1,14 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
+    <Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>
 
     <Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
     <Thickness x:Key="ComboBoxSelectorDefaultPadding">8 0</Thickness>
 
+    <x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
     <Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
+    <CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>
 
+    <Thickness x:Key="ComboBoxClearButtonMargin">0 0 8 0</Thickness>
+    <Thickness x:Key="ComboBoxIconMargin">0 0 12 0</Thickness>
+    <x:Double x:Key="ComboBoxIconWidth">12</x:Double>
+    <x:Double x:Key="ComboBoxIconHeight">12</x:Double>
     <StreamGeometry x:Key="ComboBoxIcon">
         M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
     </StreamGeometry>
+    <Thickness x:Key="ComboBoxPopupBorderMargin">0 4</Thickness>
 
     <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
     <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>