From 9a738603d0a5cc26e61f0640c6a7424dba8e11b0 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 15 May 2024 18:44:43 +0800
Subject: [PATCH] feat: add :focus-visible pseudoclass to ComboBox.

---
 src/Semi.Avalonia/Controls/ComboBox.axaml     | 11 +++++++++++
 src/Semi.Avalonia/Themes/Dark/ComboBox.axaml  |  2 +-
 src/Semi.Avalonia/Themes/Light/ComboBox.axaml |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 085e580..1b3a313 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -179,6 +179,10 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
         </Style>
 
+        <Style Selector="^:focus-visible">
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
+        </Style>
+
         <!--  Disabled State  -->
         <Style Selector="^:disabled">
             <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
@@ -224,6 +228,9 @@
                 <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedPressedBackground}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedPressedBorderBrush}" />
             </Style>
+            <Style Selector="^:focus-visible /template/ Border#Background">
+                <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderedPointeroverBorderBrush}" />
+            </Style>
             <Style Selector="^:disabled">
                 <Style Selector="^ /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
@@ -305,5 +312,9 @@
                 <Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
+
+        <Style Selector="^:focus-visible /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 9554648..aa5b596 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -5,7 +5,7 @@
     <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#54A9FF" />
 
     <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#F9F9F9" />
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index e5641df..e73d69e 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -5,7 +5,7 @@
     <SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
     <SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#004FB3" />
+    <SolidColorBrush x:Key="ComboBoxSelectorPressedBorderBrush" Color="#0077FA" />
 
     <SolidColorBrush x:Key="ComboBoxIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="ComboBoxIconPointeroverForeground" Color="#1C1F23" />