From 5e5311f067700a980a311f861edfb59d28f54ce8 Mon Sep 17 00:00:00 2001
From: Mccree Lee <2935876049@qq.com>
Date: Sat, 1 Jun 2024 22:54:31 +0800
Subject: [PATCH] fix: calendarDatePicker foreground

---
 SukiUI/Theme/CalendarDatePickerStyle.axaml | 140 +++++++++++++++++++++
 SukiUI/Theme/CalendarDatePickertyle.axaml  | 132 -------------------
 SukiUI/Theme/Index.axaml                   |   2 +-
 3 files changed, 141 insertions(+), 133 deletions(-)
 create mode 100644 SukiUI/Theme/CalendarDatePickerStyle.axaml
 delete mode 100644 SukiUI/Theme/CalendarDatePickertyle.axaml

diff --git a/SukiUI/Theme/CalendarDatePickerStyle.axaml b/SukiUI/Theme/CalendarDatePickerStyle.axaml
new file mode 100644
index 000000000..632d9d95d
--- /dev/null
+++ b/SukiUI/Theme/CalendarDatePickerStyle.axaml
@@ -0,0 +1,140 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System"
+                    x:ClassModifier="internal">
+
+    <Design.PreviewWith>
+        <Border Width="800"
+                Height="800"
+                Padding="50">
+            <CalendarDatePicker />
+        </Border>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid ColumnDefinitions="*,Auto">
+                    <Grid.Styles>
+                        <Style Selector="Button.CalendarDropDown">
+                            <Setter Property="Template">
+                                <ControlTemplate>
+                                    <Grid Width="22"
+                                          Height="20"
+                                          Margin="0,0,0,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Background="Transparent"
+                                          ClipToBounds="False"
+                                          ColumnDefinitions="*,*,*,*"
+                                          RowDefinitions="23*,19*,19*,19*">
+
+                                        <Border Name="Background"
+                                                Grid.Row="1"
+                                                Grid.RowSpan="3"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="4"
+                                                Margin="0,-1,0,0"
+                                                BorderBrush="{DynamicResource SukiControlBorderBrush}"
+                                                BorderThickness="1"
+                                                CornerRadius="0,0,2,2" />
+
+                                        <Border Grid.Row="0"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="4"
+                                                Background="{DynamicResource SukiPrimaryColor}"
+                                                BorderBrush="{DynamicResource SukiControlBorderBrush}"
+                                                BorderThickness="1"
+                                                CornerRadius="3,3,0,0" />
+
+                                        <TextBlock Grid.Row="1"
+                                                   Grid.RowSpan="3"
+                                                   Grid.Column="0"
+                                                   Grid.ColumnSpan="4"
+                                                   Margin="0,-1,0,0"
+                                                   HorizontalAlignment="Center"
+                                                   VerticalAlignment="Center"
+                                                   FontSize="{DynamicResource FontSizeSmall}"
+                                                   Foreground="{DynamicResource SukiLowText}"
+                                                   Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+
+                                        <Ellipse Grid.Row="0"
+                                                 Grid.Column="0"
+                                                 Grid.ColumnSpan="4"
+                                                 Width="2"
+                                                 Height="2"
+                                                 HorizontalAlignment="Center"
+                                                 VerticalAlignment="Center"
+                                                 Fill="{DynamicResource SukiControlBorderBrush}"
+                                                 StrokeThickness="0" />
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter>
+                        </Style>
+
+                        <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
+                            <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor5}" />
+                        </Style>
+                    </Grid.Styles>
+
+                    <TextBox Name="PART_TextBox"
+                             Grid.Column="0"
+                             Padding="{TemplateBinding Padding}"
+                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                             Background="{TemplateBinding Background}"
+                             BorderBrush="{TemplateBinding BorderBrush}"
+                             BorderThickness="{TemplateBinding BorderThickness}"
+                             CornerRadius="{TemplateBinding CornerRadius}"
+                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                             UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                             Watermark="{TemplateBinding Watermark}" />
+
+                    <Button Name="PART_Button"
+                            Grid.Column="1"
+                            Width="20"
+                            Margin="6,0"
+                            Padding="0"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Classes="CalendarDropDown"
+                            ClipToBounds="False"
+                            Focusable="False"
+                            Foreground="{TemplateBinding Foreground}" />
+
+                    <Popup Name="PART_Popup"
+                           Grid.Column="0"
+                           IsLightDismissEnabled="False"
+                           PlacementTarget="{TemplateBinding}">
+                        <Panel>
+                            <Border Margin="15"
+                                    Padding="15,8,8,12"
+                                    Background="{DynamicResource SukiStrongBackground}"
+                                    BoxShadow="{DynamicResource SukiPopupShadow}"
+                                    CornerRadius="14">
+                                <Calendar Name="PART_Calendar"
+                                          DisplayDate="{TemplateBinding DisplayDate}"
+                                          DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
+                                          DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                                          FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                                          Foreground="{DynamicResource SukiText}"
+                                          IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                                          SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}" />
+                            </Border>
+                        </Panel>
+                    </Popup>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:focus /template/ TextBox#PART_TextBox">
+            <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/Theme/CalendarDatePickertyle.axaml b/SukiUI/Theme/CalendarDatePickertyle.axaml
deleted file mode 100644
index 34b93258d..000000000
--- a/SukiUI/Theme/CalendarDatePickertyle.axaml
+++ /dev/null
@@ -1,132 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="using:System"
-                    xmlns:controls="clr-namespace:SukiUI.Controls"
-                    x:ClassModifier="internal">
-  <Design.PreviewWith>
-    <Border Height="800" Width="800" Padding="50">
-      <CalendarDatePicker></CalendarDatePicker>
-    </Border>
-    
-  </Design.PreviewWith>
-  <ControlTheme x:Key="{x:Type CalendarDatePicker}"
-                TargetType="CalendarDatePicker">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0,0,0,1" />
-    <Setter Property="FontSize" Value="14" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
-    <Setter Property="Padding" Value="4" />
-<Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto">
-
-          <Grid.Styles>
-
-            <Style Selector="Button.CalendarDropDown">
-              <Setter Property="Template">
-                <ControlTemplate>
-                  <Grid Width="22"
-                        Height="20"
-                        Margin="0,0,0,0"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Background="Transparent"
-                        ClipToBounds="False"
-                        ColumnDefinitions="*,*,*,*"
-                        RowDefinitions="23*,19*,19*,19*">
-
-                    <Border Name="Background"
-                            Grid.Row="1"
-                            Grid.RowSpan="3"
-                            Grid.ColumnSpan="4"
-                            Margin="0,-1,0,0"
-                            BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="0,0,2,2" />
-                    <Border Grid.RowSpan="1"
-                               Grid.ColumnSpan="4" CornerRadius="3,3,0,0"
-                               Background="{DynamicResource SukiPrimaryColor}"
-                               BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                               BorderThickness="1" />
-                    <TextBlock Grid.Row="1"
-                               Grid.RowSpan="3"
-                               Grid.Column="0"
-                               Grid.ColumnSpan="4"
-                               Margin="0,-1,0,0"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               FontSize="{DynamicResource FontSizeSmall}"
-                               Foreground="{DynamicResource SukiLowText}"
-                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
-
-                    <Ellipse Grid.ColumnSpan="4"
-                             Width="2"
-                             Height= "2"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Center"
-                             Fill="{DynamicResource SukiControlBorderBrush}"
-                             StrokeThickness="0" />
-                  </Grid>
-                </ControlTemplate>
-              </Setter>
-            </Style>
-
-        
-
-            <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
-              <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor5}" />
-            </Style>
-
-          </Grid.Styles>
-
-          <TextBox Name="PART_TextBox"
-                   Grid.Column="0"
-                   Padding="{TemplateBinding Padding}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   Background="{TemplateBinding Background}"
-                   BorderBrush="{TemplateBinding BorderBrush}"
-                   BorderThickness="{TemplateBinding BorderThickness}"
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   Watermark="{TemplateBinding Watermark}" />
-
-          <Button Name="PART_Button"
-                  Grid.Column="1"
-                  Width="20"
-                  Margin="6,0"
-                  Padding="0"
-                  Background="Transparent"
-                  BorderThickness="0"
-                  Classes="CalendarDropDown"
-                  ClipToBounds="False"
-                  Focusable="False"
-                  Foreground="{TemplateBinding Foreground}" />
-
-          <Popup Name="PART_Popup"
-                 PlacementTarget="{TemplateBinding}"
-                 IsLightDismissEnabled="False">
-            <Panel>
-            <Border Margin="15" Padding="15,8,8,12" CornerRadius="14" Background="{DynamicResource SukiStrongBackground}" BoxShadow="{DynamicResource SukiPopupShadow}">
-            <Calendar Name="PART_Calendar"
-                      DisplayDate="{TemplateBinding DisplayDate}"
-                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
-                      DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                      SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate,
-                                                     Mode=TwoWay}" />
-            </Border>
-            </Panel>
-          </Popup>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-
-    <Style Selector="^:focus /template/ TextBox#PART_TextBox">
-      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
-    </Style>
-  </ControlTheme>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/Theme/Index.axaml b/SukiUI/Theme/Index.axaml
index 3aa643974..0d8294973 100644
--- a/SukiUI/Theme/Index.axaml
+++ b/SukiUI/Theme/Index.axaml
@@ -56,7 +56,7 @@
                 <ResourceInclude Source="avares://sukiUI/Theme/Button.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/PathIcon.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Expander.axaml" />
-                <ResourceInclude Source="avares://sukiUI/Theme/CalendarDatePickertyle.axaml" />
+                <ResourceInclude Source="avares://sukiUI/Theme/CalendarDatePickerStyle.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/TabControl.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/TabItem.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/DropDownButton.axaml" />