From 95744b7a6468aec64d844d665e00eb04937f6d18 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:17:54 +0800
Subject: [PATCH] fix: fix Popup related control Background color.

---
 src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml      | 2 +-
 src/Semi.Avalonia/Themes/Dark/Calendar.axaml             | 8 ++++----
 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                 | 4 ++--
 src/Semi.Avalonia/Themes/Light/Calendar.axaml            | 4 +---
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 5b151d2..7e13458 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>
-    <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="#35363C" />
+    <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/Calendar.axaml b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
index a7a8bae..9b994ad 100644
--- a/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Calendar.axaml
@@ -1,17 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="CalendarBackground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarBackground" Color="#43444A" />
     <SolidColorBrush x:Key="CalendarForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="White" />
     <SolidColorBrush x:Key="CalendarItemWeekDayNameForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemIconForeground" Opacity="0.6" Color="#F9F9F9" />
 
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonBackground" Color="#43444A" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonPressedBackground" Opacity="0.20" Color="White" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarItemCalendarButtonSelectedForeground" Color="#43444A" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
     <SolidColorBrush x:Key="CalendarItemCalendarButtonInactiveForeground" Opacity="0.65" Color="#F9F9F9" />
@@ -24,7 +24,7 @@
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonPressedBackground" Opacity="0.20" Color="White" />
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="#232429" />
+    <SolidColorBrush x:Key="CalendarItemCalendarDayButtonSelectedForeground" Color="#43444A" />
 
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="CalendarItemCalendarDayButtonTodayBackground" Opacity="0.12" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 410298a..5d8a707 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -18,7 +18,7 @@
     <SolidColorBrush x:Key="ComboBoxDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <BoxShadows x:Key="ComboBoxPopupBoxShadow">0 0 8 0 #1AFFFFFF</BoxShadows>
-    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="ComboBoxPopupBackground" Color="#43444A" />
     <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Opacity="0.08" Color="White" />
 
     <SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index ed62aa2..8a9b1a9 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="#43444A" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DateTimePickerFlyoutButtonPressedForeground" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index 12b6f5e..6e2a1fb 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="FlyoutBackground" Color="#35363C" />
+    <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>
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index e87602a..91175d7 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -2,12 +2,12 @@
     <SolidColorBrush x:Key="MenuFlyoutScrollViewerIconForeground" Opacity="0.6" Color="#F9F9F9" />
 
     <!--  MenuFlyout  -->
-    <SolidColorBrush x:Key="MenuFlyoutBackground" Color="#35363C" />
+    <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>
 
     <!--  MenuItem  -->
-    <SolidColorBrush x:Key="MenuItemBackground" Color="#35363C" />
+    <SolidColorBrush x:Key="MenuItemBackground" Color="#43444A" />
     <SolidColorBrush x:Key="MenuItemForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="MenuItemSeparatorBackground" Opacity="0.08" Color="White" />
diff --git a/src/Semi.Avalonia/Themes/Light/Calendar.axaml b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
index 004048d..92a51ef 100644
--- a/src/Semi.Avalonia/Themes/Light/Calendar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Calendar.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CalendarBackground" Color="White" />
     <SolidColorBrush x:Key="CalendarForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="CalendarBorderBrush" Opacity="0.08" Color="#1C1F23" />