diff --git a/portprotonqt/themes/classic-light/styles.py b/portprotonqt/themes/classic-light/styles.py index 62527342..bc3ca908 100644 --- a/portprotonqt/themes/classic-light/styles.py +++ b/portprotonqt/themes/classic-light/styles.py @@ -35,6 +35,7 @@ color_surface = "#F0F2F5" color_surface_elevated = "#E9ECEF" color_surface_hover = "#DEE2E6" color_text = "#ffffff" +color_text_accent_hover = "#F8F9FC" color_surface_light = "#d2d3db" color_surface_mid = "#9394a5" color_text_dark = "#212529" @@ -199,6 +200,7 @@ PLAY_BUTTON_STYLE = f""" }} QPushButton:hover, QPushButton:pressed, QPushButton:focus {{ background: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -216,10 +218,12 @@ ADDGAME_BACK_BUTTON_STYLE = f""" }} QPushButton:hover, QPushButton:pressed {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ background: {color_accent}; border: {border_thin} {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -238,6 +242,7 @@ LIBRARY_CONTROLS_BUTTON_STYLE = f""" QPushButton:hover, QPushButton:pressed, QPushButton:focus, QPushButton:checked {{ background: {color_accent}; border: {border_thin} {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -314,12 +319,12 @@ COMBOBOX_STYLE = f""" QComboBox:hover {{ border: {border_medium} {color_accent}; background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QComboBox:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QComboBox:disabled {{ background: {color_surface_hover}; @@ -385,7 +390,7 @@ COMBOBOX_STYLE = f""" }} QListView::item:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ % ( theme_manager.get_icon("down", current_theme_name, as_path=True), @@ -460,12 +465,11 @@ TAB_STYLE = f""" }} QTabBar::tab:selected {{ background: {color_accent}; - color: {color_text_dark}; - color: {color_text}; + color: {color_text_accent_hover}; }} QTabBar::tab:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -498,15 +502,16 @@ QTableWidget::item:selected, QTableWidget::item:focus, QTableWidget::item:selected:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; selection-background-color: {color_accent}; }} QTableWidget::item:hover {{ background: {color_transparent}; + color: {color_text_accent_hover}; }} QTableWidget::item:selected:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -530,15 +535,17 @@ ACTION_BUTTON_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_accent}; color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -556,7 +563,7 @@ ACTION_BUTTON_ACTIVE_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_bg}; @@ -564,7 +571,7 @@ ACTION_BUTTON_ACTIVE_STYLE = f""" QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ diff --git a/portprotonqt/themes/classic/styles.py b/portprotonqt/themes/classic/styles.py index 01296f53..4aa4ba3f 100644 --- a/portprotonqt/themes/classic/styles.py +++ b/portprotonqt/themes/classic/styles.py @@ -142,6 +142,7 @@ PLAY_BUTTON_STYLE = f""" }} QPushButton:hover, QPushButton:pressed, QPushButton:focus {{ background: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -159,10 +160,12 @@ ADDGAME_BACK_BUTTON_STYLE = f""" }} QPushButton:hover, QPushButton:pressed {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ background: {color_accent}; border: {border_thin} {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -181,6 +184,7 @@ LIBRARY_CONTROLS_BUTTON_STYLE = f""" QPushButton:hover, QPushButton:pressed, QPushButton:focus, QPushButton:checked {{ background: {color_accent}; border: {border_thin} {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -272,10 +276,12 @@ COMBOBOX_STYLE = f""" QComboBox:hover {{ border: {border_medium} {color_accent}; background: {color_accent}; + color: {color_text_accent_hover}; }} QComboBox:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; + color: {color_text_accent_hover}; }} QComboBox:disabled {{ background: {color_combo_disabled_bg}; @@ -340,7 +346,7 @@ COMBOBOX_STYLE = f""" }} QListView::item:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ % ( theme_manager.get_icon("down", current_theme_name, as_path=True), @@ -352,6 +358,7 @@ SETTINGS_TABLE_COMBOBOX_STYLE = f""" QComboBox#settingsTableCombo:focus {{ background: {color_surface}; border: {border_medium} {color_accent}; + color: {color_text}; }} """ @@ -414,10 +421,11 @@ TAB_STYLE = f""" }} QTabBar::tab:selected {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QTabBar::tab:hover {{ background: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -476,15 +484,16 @@ QTableWidget::item:selected, QTableWidget::item:focus, QTableWidget::item:selected:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; selection-background-color: {color_accent}; }} QTableWidget::item:hover {{ background: {color_transparent}; + color: {color_text_accent_hover}; }} QTableWidget::item:selected:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -501,14 +510,17 @@ ACTION_BUTTON_STYLE = f""" }} QPushButton:hover {{ background: {color_accent}; + color: {color_text_accent_hover}; border: {border_medium} {color_accent}; }} QPushButton:pressed {{ background: {color_bg}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -526,13 +538,16 @@ ACTION_BUTTON_ACTIVE_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_bg}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; + color: {color_text_accent_hover}; }} """ diff --git a/portprotonqt/themes/standart-light/styles.py b/portprotonqt/themes/standart-light/styles.py index 001cbee8..065b93b5 100644 --- a/portprotonqt/themes/standart-light/styles.py +++ b/portprotonqt/themes/standart-light/styles.py @@ -49,11 +49,12 @@ color_surface = "#F0F2F5" color_surface_elevated = "#E9ECEF" color_surface_hover = "#DEE2E6" color_text = "#ffffff" +color_text_accent_hover = "#F8F9FC" +color_text_dark = "#212529" color_transparent = "transparent" color_overlay = "rgba(40, 42, 51, 0.9)" color_surface_light = "#d2d3db" color_surface_mid = "#9394a5" -color_text_dark = "#212529" # === Button Icons Color === ICON_COLORS = { @@ -429,13 +430,13 @@ MESSAGE_BOX_STYLE = f""" }} QMessageBox QPushButton:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; border-color: border: {border_thin} {color_accent}; }} QMessageBox QPushButton:focus {{ border: {border_medium} {color_accent}; background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -707,6 +708,7 @@ DRIVES_BUTTON_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_bg}; @@ -714,6 +716,7 @@ DRIVES_BUTTON_STYLE = f""" QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -732,6 +735,7 @@ OVERLAY_BUTTON_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_bg}; @@ -739,6 +743,7 @@ OVERLAY_BUTTON_STYLE = f""" QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -964,12 +969,15 @@ PLAY_BUTTON_STYLE = f""" }} QPushButton:hover {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ background: {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -995,13 +1003,16 @@ ADDGAME_BACK_BUTTON_STYLE = f""" }} QPushButton:hover {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_accent}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ background: {color_accent}; border: {border_thin} {color_accent}; + color: {color_text_accent_hover}; }} """ @@ -1152,15 +1163,16 @@ QTableWidget::item:selected, QTableWidget::item:focus, QTableWidget::item:selected:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; selection-background-color: {color_accent}; }} QTableWidget::item:hover {{ background: {color_transparent}; + color: {color_text_accent_hover}; }} QTableWidget::item:selected:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -1243,13 +1255,13 @@ COMBOBOX_STYLE = f""" QComboBox:hover {{ border: {border_medium} {color_accent}; background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} /* Focus state */ QComboBox:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QComboBox:disabled {{ background: {color_combo_disabled_bg}; @@ -1317,7 +1329,7 @@ COMBOBOX_STYLE = f""" /* Selection in list when item is focused */ QListView::item:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -1460,11 +1472,11 @@ TAB_STYLE = f""" }} QTabBar::tab:selected {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QTabBar::tab:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -1513,16 +1525,16 @@ ACTION_BUTTON_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -1540,7 +1552,7 @@ ACTION_BUTTON_ACTIVE_STYLE = f""" QPushButton:hover {{ background: {color_accent}; border: {border_medium} {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background: {color_bg}; @@ -1548,7 +1560,7 @@ ACTION_BUTTON_ACTIVE_STYLE = f""" QPushButton:focus {{ border: {border_medium} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} """ @@ -1579,7 +1591,7 @@ QTableWidget::item:selected, QTableWidget::item:selected:!active, QTableWidget::item:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} /* LogArea */ QFrame {{ @@ -1630,17 +1642,17 @@ FILE_EXPLORER_STYLE = f""" }} QListView::item:selected {{ background: {color_accent}; - color: {color_text_dark}; + color: {color_text_accent_hover}; border-radius: {border_radius_small}; }} QListView::item:hover {{ background: {color_accent}; - color: {color_text_dark}; + color: {color_text_accent_hover}; border-radius: {border_radius_small}; }} QListView::item:focus {{ background: {color_accent}; - color: {color_text_dark}; + color: {color_text_accent_hover}; border-radius: {border_radius_small}; }} """ @@ -1682,11 +1694,11 @@ CONTEXT_MENU_STYLE = f""" }} QMenu::item:hover {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QMenu::item:focus {{ background: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; border: {border_thin} {color_border_light}; border-radius: {border_radius_small}; }} @@ -1714,17 +1726,17 @@ QPushButton {{ QPushButton:hover {{ background-color: {color_accent}; border: {border_thin} {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_thin} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton[vk_selected="true"] {{ border: {border_thin} {color_accent}; background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; }} QPushButton:pressed {{ background-color: {color_surface_hover}; @@ -1733,7 +1745,7 @@ QPushButton:pressed {{ }} QPushButton[checked="true"] {{ background-color: {color_accent}; - color: {color_text}; + color: {color_text_accent_hover}; border: {border_none} {color_transparent}; }} QPushButton[checked="true"]:focus {{ diff --git a/portprotonqt/themes/standart/styles/base.py b/portprotonqt/themes/standart/styles/base.py index 20a30d81..c4026d7c 100644 --- a/portprotonqt/themes/standart/styles/base.py +++ b/portprotonqt/themes/standart/styles/base.py @@ -242,7 +242,7 @@ ACTION_BUTTON_STYLE = f""" }} QPushButton:pressed {{ background: {color_bg}; - color: {color_text_accent_hover};color: {color_text_accent_hover}; + color: {color_text_accent_hover}; }} QPushButton:focus {{ border: {border_medium} {color_accent};