Merge pull request #191 from DreZeo/fix/ui-visual-polish

fix(ui): 修复窗口黑边、下拉框双层边框，优化滚动条/分割条与主题配色

Author: hgmzhn

desktop_qt_ui/ui/styles.py

@@ -180,7 +180,8 @@ def build_input_controls_stylesheet(
             background-color: {colors["bg_dropdown"]};
             alternate-background-color: {colors["bg_dropdown"]};
             color: {colors[text_color_key]};
-            border: 1px solid {colors["border_input"]};
+            border: none;
+            border-radius: 0px;
             selection-background-color: {colors["dropdown_selection"]};
             selection-color: {colors["list_item_selected_text"]};
             outline: none;
@@ -266,14 +267,14 @@ def build_scrollbar_stylesheet(colors: dict, scope: str = "") -> str:
     return f"""
         {_scoped_selector(scope, "QScrollBar:vertical")},
         {_scoped_selector(scope, "QScrollBar:horizontal")} {{
-            background: {colors["bg_scroll"]};
-            border-radius: 6px;
+            background: transparent;
+            border-radius: 3px;
             border: none;
         }}
         {_scoped_selector(scope, "QScrollBar::handle:vertical")},
         {_scoped_selector(scope, "QScrollBar::handle:horizontal")} {{
             background: {colors["scroll_handle"]};
-            border-radius: 6px;
+            border-radius: 3px;
         }}
         {_scoped_selector(scope, "QScrollBar::handle:vertical:hover")},
         {_scoped_selector(scope, "QScrollBar::handle:horizontal:hover")} {{
@@ -632,10 +633,10 @@ def generate_application_stylesheet(theme: str) -> str:
         }}
         {build_scrollbar_stylesheet(c)}
         QScrollBar:vertical {{
-            width: 10px;
+            width: 6px;
         }}
         QScrollBar:horizontal {{
-            height: 10px;
+            height: 6px;
         }}
         QScrollBar::handle:vertical,
         QScrollBar::handle:horizontal {{

desktop_qt_ui/ui/theme.py

@@ -314,11 +314,12 @@ def _set_dwm_attr(attribute: int, data):
             _set_dwm_attr(DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, dark_mode)
 
         caption_color = _to_colorref(colors["bg_window_shell"])
-        border_color = _to_colorref(colors["border_sidebar"])
         text_color = _to_colorref(colors["text_bright"] if is_dark_caption else colors["text_accent"])
 
         _set_dwm_attr(DWMWA_CAPTION_COLOR, caption_color)
-        _set_dwm_attr(DWMWA_BORDER_COLOR, border_color)
+        # 不设置 DWMWA_BORDER_COLOR：border_sidebar 是半透明色（如 rgba(0,0,0,0.05)），
+        # 而 COLORREF 不支持 alpha，转换时会丢掉透明度变成纯黑/纯白描边。
+        # 让 Windows 使用原生默认边框，配色更自然。
         _set_dwm_attr(DWMWA_TEXT_COLOR, text_color)
 
         user32.SetWindowPos(

desktop_qt_ui/ui/theme_tokens.py

@@ -18,7 +18,7 @@
     "light": {"base_theme": "light", "accent": "sky"},
     "dark": {"base_theme": "dark", "accent": "blue"},
     "gray": {"base_theme": "gray", "accent": "slate"},
-    "ocean": {"base_theme": "dark", "accent": "teal"},
+    "ocean": {"base_theme": "light", "accent": "blue"},
     "forest": {"base_theme": "gray", "accent": "green"},
     "sunset": {"base_theme": "gray", "accent": "orange"},
     "rose": {"base_theme": "dark", "accent": "rose"},
@@ -268,9 +268,9 @@
         "list_item_selected": "rgba(59, 130, 246, 0.12)",
         "list_item_selected_text": "#0F172A",
         "dropdown_selection": "rgba(59, 130, 246, 0.15)",
-        "scroll_handle": "rgba(0, 0, 0, 0.15)",
-        "scroll_handle_hover": "rgba(0, 0, 0, 0.25)",
-        "splitter_handle": "rgba(0, 0, 0, 0.05)",
+        "scroll_handle": "#D8DCE2",
+        "scroll_handle_hover": "#C2C7D0",
+        "splitter_handle": "transparent",
         "splitter_handle_hover": "rgba(59, 130, 246, 0.40)",
         "divider_accent_start": "#3B82F6",
         "divider_accent_end": "#2563EB",
@@ -443,74 +443,77 @@
 
 _THEME_TOKEN_OVERRIDES = {
     "ocean": {
-        "bg_gradient_start": "#061821",
-        "bg_gradient_mid": "#0B2731",
-        "bg_gradient_end": "#123947",
-        "bg_window_shell": "#071922",
-        "bg_shell_edge": "rgba(102, 184, 196, 0.18)",
-        "bg_sidebar": "rgba(5, 18, 25, 0.97)",
-        "bg_card": "rgba(11, 29, 39, 0.93)",
-        "bg_card_border": "rgba(102, 176, 188, 0.24)",
-        "bg_panel": "rgba(12, 31, 41, 0.95)",
-        "bg_toolbar": "rgba(8, 21, 29, 0.97)",
-        "bg_toolbar_border": "rgba(106, 180, 192, 0.24)",
-        "bg_input": "rgba(8, 22, 31, 0.94)",
-        "bg_input_focus": "rgba(11, 28, 37, 0.98)",
-        "bg_text_edit": "rgba(8, 22, 30, 0.95)",
-        "bg_list": "rgba(7, 19, 27, 0.82)",
-        "bg_dropdown": "#0B2430",
-        "bg_header_card": "rgba(14, 34, 45, 0.94)",
-        "bg_desc_panel": "rgba(10, 25, 34, 0.96)",
-        "bg_scroll": "rgba(10, 24, 33, 0.78)",
-        "bg_settings_input": "rgba(8, 22, 31, 0.96)",
-        "bg_canvas": "#10232D",
-        "bg_canvas_overlay": "rgba(16, 35, 45, 0.95)",
-        "bg_surface_raised": "rgba(17, 39, 50, 0.97)",
-        "bg_surface_soft": "rgba(13, 31, 40, 0.76)",
-        "text_primary": "#D7EDF2",
-        "text_secondary": "#C0D7DC",
-        "text_accent": "#F1FCFE",
-        "text_bright": "#F8FEFF",
-        "text_muted": "#9DBBC1",
-        "text_brand": "#DDF2F5",
-        "text_sidebar_group": "#84A8B0",
-        "text_card_title": "#CCE1E5",
-        "text_page_title": "#F0FCFF",
-        "text_page_subtitle": "#95BBC2",
-        "text_row_label": "#C4DDE2",
-        "text_desc_header": "#D4ECF0",
-        "text_desc_key": "#6F949C",
-        "text_desc_text": "#B7CED3",
-        "text_settings_label": "#BFD8DC",
-        "text_divider_title": "#D7EEF2",
-        "text_divider_sub": "#98BDC3",
-        "border_input": "rgba(110, 146, 156, 0.48)",
-        "border_input_hover": "rgba(126, 173, 183, 0.60)",
-        "border_card": "rgba(102, 176, 188, 0.24)",
-        "border_list": "rgba(103, 146, 156, 0.34)",
-        "border_sidebar": "rgba(108, 151, 161, 0.20)",
-        "border_tab": "rgba(81, 123, 133, 0.36)",
-        "border_settings_input": "rgba(92, 134, 143, 0.40)",
-        "border_settings_input_hover": "rgba(122, 169, 178, 0.58)",
-        "border_subtle": "rgba(123, 162, 171, 0.14)",
-        "btn_soft_bg": "rgba(21, 47, 58, 0.48)",
-        "btn_soft_border": "rgba(104, 149, 159, 0.44)",
-        "btn_soft_hover": "rgba(29, 59, 71, 0.70)",
-        "btn_soft_pressed": "rgba(36, 72, 85, 0.86)",
-        "btn_chip_bg": "rgba(20, 44, 55, 0.86)",
-        "btn_chip_border": "rgba(89, 132, 142, 0.48)",
-        "btn_chip_hover": "rgba(32, 61, 73, 0.96)",
-        "tab_bg": "rgba(19, 42, 53, 0.84)",
-        "scroll_handle": "rgba(108, 141, 149, 0.48)",
-        "scroll_handle_hover": "rgba(130, 169, 179, 0.68)",
-        "splitter_handle": "rgba(121, 155, 164, 0.20)",
-        "divider_sub_line": "rgba(131, 168, 177, 0.18)",
-        "checkbox_border": "rgba(97, 139, 148, 0.58)",
-        "checkbox_bg": "rgba(8, 22, 31, 0.96)",
-        "slider_groove": "rgba(53, 85, 94, 0.54)",
-        "separator_color": "rgba(121, 155, 164, 0.32)",
-        "desc_panel_border": "rgba(102, 176, 188, 0.26)",
-        "settings_desc_panel_bg": "rgba(10, 25, 34, 0.96)",
+        "bg_gradient_start": "#EAF2FB",
+        "bg_gradient_mid": "#E2EEFA",
+        "bg_gradient_end": "#D8E8F7",
+        "bg_window_shell": "#EAF2FB",
+        "bg_shell_edge": "rgba(74, 142, 224, 0.18)",
+        "bg_sidebar": "#E4EDFA",
+        "bg_card": "#FFFFFF",
+        "bg_card_border": "rgba(74, 142, 224, 0.18)",
+        "bg_panel": "#FFFFFF",
+        "bg_toolbar": "#E8F0FA",
+        "bg_toolbar_border": "rgba(74, 142, 224, 0.16)",
+        "bg_input": "#FFFFFF",
+        "bg_input_focus": "#F4F8FD",
+        "bg_text_edit": "#FFFFFF",
+        "bg_list": "#F4F8FD",
+        "bg_dropdown": "#FFFFFF",
+        "bg_header_card": "#FFFFFF",
+        "bg_desc_panel": "#F4F8FD",
+        "bg_scroll": "rgba(74, 142, 224, 0.08)",
+        "bg_settings_input": "#FFFFFF",
+        "bg_canvas": "#EAF2FB",
+        "bg_canvas_overlay": "#FFFFFF",
+        "bg_surface_raised": "#FFFFFF",
+        "bg_surface_soft": "#EEF4FC",
+        "text_primary": "#1E2A3A",
+        "text_secondary": "#5A6B82",
+        "text_accent": "#13243A",
+        "text_bright": "#0B1A2E",
+        "text_desc_name": "#0B1A2E",
+        "text_muted": "#8A99AE",
+        "text_disabled": "rgba(90, 107, 130, 0.45)",
+        "text_brand": "#1E2A3A",
+        "text_sidebar_group": "#8A99AE",
+        "text_card_title": "#1E2A3A",
+        "text_page_title": "#0B1A2E",
+        "text_page_subtitle": "#5A6B82",
+        "text_row_label": "#33425A",
+        "text_desc_header": "#33425A",
+        "text_desc_key": "#4A8EE0",
+        "text_desc_text": "#4B5C74",
+        "text_settings_label": "#33425A",
+        "text_divider_title": "#1E2A3A",
+        "text_divider_sub": "#5A6B82",
+        "border_input": "rgba(74, 142, 224, 0.32)",
+        "border_input_hover": "rgba(74, 142, 224, 0.55)",
+        "border_card": "rgba(74, 142, 224, 0.16)",
+        "border_list": "rgba(74, 142, 224, 0.16)",
+        "border_sidebar": "rgba(74, 142, 224, 0.14)",
+        "border_tab": "rgba(74, 142, 224, 0.20)",
+        "border_settings_input": "rgba(74, 142, 224, 0.24)",
+        "border_settings_input_hover": "rgba(74, 142, 224, 0.50)",
+        "border_subtle": "rgba(74, 142, 224, 0.10)",
+        "btn_soft_bg": "#EEF4FC",
+        "btn_soft_border": "rgba(74, 142, 224, 0.22)",
+        "btn_soft_hover": "#E2EDF9",
+        "btn_soft_pressed": "#D6E6F6",
+        "btn_soft_text": "#1E3A5F",
+        "btn_chip_bg": "#EEF4FC",
+        "btn_chip_border": "rgba(74, 142, 224, 0.24)",
+        "btn_chip_hover": "#E2EDF9",
+        "tab_bg": "#EEF4FC",
+        "scroll_handle": "rgba(74, 142, 224, 0.35)",
+        "scroll_handle_hover": "rgba(74, 142, 224, 0.55)",
+        "splitter_handle": "transparent",
+        "divider_sub_line": "rgba(74, 142, 224, 0.12)",
+        "checkbox_border": "rgba(74, 142, 224, 0.40)",
+        "checkbox_bg": "#FFFFFF",
+        "slider_groove": "rgba(74, 142, 224, 0.18)",
+        "separator_color": "rgba(74, 142, 224, 0.16)",
+        "desc_panel_border": "rgba(74, 142, 224, 0.18)",
+        "settings_desc_panel_bg": "#F4F8FD",
     },
     "forest": {
         "bg_gradient_start": "#1B2319",
@@ -541,15 +544,17 @@
         "text_secondary": "#D0D8CC",
         "text_accent": "#F6FAF4",
         "text_bright": "#FFFFFF",
+        "text_desc_name": "#FFFFFF",
         "text_muted": "#AEB9A8",
+        "text_disabled": "rgba(174, 185, 168, 0.45)",
         "text_brand": "#E7EEE4",
         "text_sidebar_group": "#9BA995",
         "text_card_title": "#D7E0D3",
         "text_page_title": "#F3F7F0",
         "text_page_subtitle": "#A5B29F",
         "text_row_label": "#D0D9CC",
         "text_desc_header": "#E1E9DE",
-        "text_desc_key": "#91A18A",
+        "text_desc_key": "#6FBF80",
         "text_desc_text": "#C7D0C3",
         "text_settings_label": "#CDD6CA",
         "text_divider_title": "#E1E9DE",
@@ -567,6 +572,7 @@
         "btn_soft_border": "rgba(127, 140, 122, 0.46)",
         "btn_soft_hover": "rgba(70, 82, 72, 0.80)",
         "btn_soft_pressed": "rgba(82, 96, 84, 0.94)",
+        "btn_soft_text": "#F6FAF4",
         "btn_chip_bg": "rgba(54, 65, 55, 0.88)",
         "btn_chip_border": "rgba(107, 120, 101, 0.42)",
         "btn_chip_hover": "rgba(67, 79, 68, 0.96)",
@@ -611,15 +617,17 @@
         "text_secondary": "#E0CBBE",
         "text_accent": "#FFF8F2",
         "text_bright": "#FFFFFF",
+        "text_desc_name": "#FFFFFF",
         "text_muted": "#C2A99A",
+        "text_disabled": "rgba(194, 169, 154, 0.45)",
         "text_brand": "#F5E7DE",
         "text_sidebar_group": "#C29B86",
         "text_card_title": "#E9D5C8",
         "text_page_title": "#FFF6F0",
         "text_page_subtitle": "#C89F88",
         "text_row_label": "#E5D1C4",
         "text_desc_header": "#F2E3DA",
-        "text_desc_key": "#B88E7B",
+        "text_desc_key": "#EAA063",
         "text_desc_text": "#D8C1B5",
         "text_settings_label": "#DEC8BB",
         "text_divider_title": "#F2E3DA",
@@ -637,6 +645,7 @@
         "btn_soft_border": "rgba(158, 122, 102, 0.46)",
         "btn_soft_hover": "rgba(78, 57, 50, 0.80)",
         "btn_soft_pressed": "rgba(92, 67, 59, 0.94)",
+        "btn_soft_text": "#F6BC8C",
         "btn_chip_bg": "rgba(60, 43, 38, 0.88)",
         "btn_chip_border": "rgba(136, 101, 84, 0.42)",
         "btn_chip_hover": "rgba(75, 54, 47, 0.96)",
@@ -681,15 +690,17 @@
         "text_secondary": "#DEC5D2",
         "text_accent": "#FFF4F8",
         "text_bright": "#FFFFFF",
+        "text_desc_name": "#FFFFFF",
         "text_muted": "#C3A3B2",
+        "text_disabled": "rgba(195, 163, 178, 0.45)",
         "text_brand": "#F7E5EE",
         "text_sidebar_group": "#C090A7",
         "text_card_title": "#EACFDC",
         "text_page_title": "#FFF4F9",
         "text_page_subtitle": "#CD9FB6",
         "text_row_label": "#E6CDD9",
         "text_desc_header": "#F2DEE8",
-        "text_desc_key": "#B6839A",
+        "text_desc_key": "#D67E96",
         "text_desc_text": "#D7BCC9",
         "text_settings_label": "#E0C7D3",
         "text_divider_title": "#F2DEE8",
@@ -707,6 +718,7 @@
         "btn_soft_border": "rgba(150, 109, 128, 0.44)",
         "btn_soft_hover": "rgba(70, 37, 56, 0.72)",
         "btn_soft_pressed": "rgba(83, 47, 68, 0.88)",
+        "btn_soft_text": "#E6A1B4",
         "btn_chip_bg": "rgba(51, 25, 41, 0.86)",
         "btn_chip_border": "rgba(136, 95, 115, 0.48)",
         "btn_chip_hover": "rgba(67, 37, 54, 0.96)",