From 6267d56b45e64e6b119489566274156425ee7723 Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Wed, 1 Mar 2023 19:31:52 +0800
Subject: [PATCH] fix combox theme

Signed-off-by: 21pages <pages21@163.com>
---
 flutter/lib/common.dart                             |  8 +++++++-
 flutter/lib/desktop/pages/desktop_setting_page.dart | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index e049c0fe1..c438a3c7b 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -109,27 +109,32 @@ class IconFont {
 class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
   const ColorThemeExtension({
     required this.border,
+    required this.border2,
     required this.highlight,
   });
 
   final Color? border;
+  final Color? border2;
   final Color? highlight;
 
   static const light = ColorThemeExtension(
     border: Color(0xFFCCCCCC),
+    border2: Color(0xFFBBBBBB),
     highlight: Color(0xFFE5E5E5),
   );
 
   static const dark = ColorThemeExtension(
     border: Color(0xFF555555),
+    border2: Color(0xFFE5E5E5),
     highlight: Color(0xFF3F3F3F),
   );
 
   @override
   ThemeExtension<ColorThemeExtension> copyWith(
-      {Color? border, Color? highlight}) {
+      {Color? border, Color? border2, Color? highlight}) {
     return ColorThemeExtension(
       border: border ?? this.border,
+      border2: border2 ?? this.border2,
       highlight: highlight ?? this.highlight,
     );
   }
@@ -142,6 +147,7 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
     }
     return ColorThemeExtension(
       border: Color.lerp(border, other.border, t),
+      border2: Color.lerp(border2, other.border2, t),
       highlight: Color.lerp(highlight, other.highlight, t),
     );
   }
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 7d907d727..0aafd48bb 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -1738,7 +1738,10 @@ class _ComboBox extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
           border: Border.all(
-              color: _disabledTextColor(context, enabled) ?? MyTheme.border)),
+        color: enabled
+            ? MyTheme.color(context).border2 ?? MyTheme.border
+            : MyTheme.border,
+      )),
       height: 30,
       child: Obx(() => DropdownButton<String>(
             isExpanded: true,
@@ -1747,7 +1750,10 @@ class _ComboBox extends StatelessWidget {
             underline: Container(
               height: 25,
             ),
-            style: TextStyle(color: _disabledTextColor(context, enabled)),
+            style: TextStyle(
+                color: enabled
+                    ? Theme.of(context).textTheme.titleMedium?.color
+                    : _disabledTextColor(context, enabled)),
             icon: const Icon(
               Icons.expand_more_sharp,
               size: 20,