From b23f79fc3961ead0da80480e4686e5f715fd5c14 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 13 Nov 2024 16:42:25 +0800
Subject: [PATCH] fix: fix BoxShadows.

(cherry picked from commit 46b1c5d1cc8f741c36955edb1da2dd4036521916)
---
 src/Semi.Avalonia/Controls/ToggleSwitch.axaml             | 4 ++--
 src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml       | 2 +-
 src/Semi.Avalonia/Themes/Dark/Border.axaml                | 2 +-
 src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml    | 2 +-
 src/Semi.Avalonia/Themes/Dark/ComboBox.axaml              | 2 +-
 src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml  | 2 +-
 src/Semi.Avalonia/Themes/Dark/Flyout.axaml                | 2 +-
 src/Semi.Avalonia/Themes/Dark/Menu.axaml                  | 2 +-
 src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml          | 2 ++
 src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml      | 2 +-
 src/Semi.Avalonia/Themes/Light/Border.axaml               | 2 +-
 src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml   | 2 +-
 src/Semi.Avalonia/Themes/Light/ComboBox.axaml             | 2 +-
 src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml | 2 +-
 src/Semi.Avalonia/Themes/Light/Flyout.axaml               | 2 +-
 src/Semi.Avalonia/Themes/Light/Menu.axaml                 | 2 +-
 src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml         | 2 ++
 17 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index 65255d5..96a3da4 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -74,7 +74,7 @@
                                 <Border
                                     Name="SwitchKnobIndicator"
                                     Background="White"
-                                    BoxShadow="0 0 1 1 #222E3238"
+                                    BoxShadow="{DynamicResource ToggleSwitchIndicatorBoxShadow}"
                                     CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" />
                                 <Arc
                                     Name="SwitchKnobLoadingIndicator"
@@ -319,7 +319,7 @@
                                 <Border
                                     Name="SwitchKnobIndicator"
                                     Background="White"
-                                    BoxShadow="0 0 1 1 #222E3238"
+                                    BoxShadow="{DynamicResource ToggleSwitchIndicatorBoxShadow}"
                                     CornerRadius="{DynamicResource ToggleSwitchIndicatorCornerRadius}" />
                                 <Arc
                                     Name="SwitchKnobLoadingIndicator"
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 7e13458..575d378 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#43444A" />
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="White" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index 4d61729..d36d0ac 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="BorderCardBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
     <SolidColorBrush x:Key="BorderCardBackground" Color="#232429" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="White" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 817c7e1..5c50c6d 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 5d8a707..82bb56d 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -17,7 +17,7 @@
 
     <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="ComboBoxPopupBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
     <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#43444A" />
     <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="White" />
 
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 8a9b1a9..4f94107 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -24,5 +24,5 @@
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#E6E8EA" />
 
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index 6e2a1fb..0d865df 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -2,5 +2,5 @@
     <SolidColorBrush x:Key="FlyoutBackground" Color="#43444A" />
     <SolidColorBrush x:Key="FlyoutForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="White" />
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="FlyoutBorderBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index 67fb339..c455600 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -5,7 +5,7 @@
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="#43444A" />
     <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="White" />
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
+    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
 
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index f5d6888..5a4c5e5 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -13,4 +13,6 @@
 
     <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="White" />
+
+    <BoxShadows x:Key="ToggleSwitchIndicatorBoxShadow">0 4 6 0 #1A000000, 0 0 1 0 #4D000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 7fb1210..520f9b5 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="AutoCompleteBoxPopupBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
     <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index eb19ed2..be23f5c 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="BorderCardBoxShadow">0 0 14 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="BorderCardBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="BorderCardBackground" Color="White" />
     <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 19a5b83..7aad814 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
     <SolidColorBrush x:Key="CalendarDatePickerFocusBorderBrush" Color="#0077FA" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
-    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Opacity="0.08" Color="#1C1F23" />
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 8fc128f..1b2e15d 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -16,7 +16,7 @@
 
     <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
     <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="White" />
     <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
 
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 8a6df07..982ecf0 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -26,5 +26,5 @@
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
     
-    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="DateTimePickerFlyoutBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index 7e7d9fd..aac33f5 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -2,5 +2,5 @@
     <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="FlyoutForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="FlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 3ec9c1a..a90c874 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -5,7 +5,7 @@
     <!--  MenuFlyout  -->
     <SolidColorBrush x:Key="MenuFlyoutBackground" Color="White" />
     <SolidColorBrush x:Key="MenuFlyoutBorderBrush" Opacity="0.08" Color="#1C1F23" />
-    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
 
     <!--  MenuItem  -->
     <SolidColorBrush x:Key="MenuItemBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index b86d9b1..0f7dbe8 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -13,4 +13,6 @@
 
     <SolidColorBrush x:Key="SimpleToggleSwitchContainerUnCheckedForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="SimpleToggleSwitchContainerCheckedForeground" Color="White" />
+
+    <BoxShadows x:Key="ToggleSwitchIndicatorBoxShadow">0 4 6 0 #1A000000, 0 0 1 0 #4D000000</BoxShadows>
 </ResourceDictionary>
\ No newline at end of file