calvin.erfmann/TagStudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2026-08-17 17:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix accent color issues on Windows (#1477)

Browse Source
This commit is contained in:
Travis Abendshien
2026-08-15 13:24:39 -07:00
committed by GitHub
parent 30c81257fa
commit 512bf623c2
4 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tagstudio/qt/models/palette.py
+14 -9
View File
@@ -2,12 +2,13 @@
# SPDX-License-Identifier: GPL-3.0-only
import platform
import traceback
from enum import IntEnum
from typing import Any
import structlog
from PySide6.QtGui import QPalette
from PySide6.QtGui import QColor, QPalette
from tagstudio.core.library.alchemy.enums import TagColorEnum
from tagstudio.core.utils.singleton import Singleton
@@ -17,22 +18,26 @@ logger = structlog.get_logger(__name__)
class Palette(metaclass=Singleton):
_palette: QPalette | None = None
_accent: str | None = None
@staticmethod
def set_palette(palette: QPalette) -> None:
Palette._palette = palette
@staticmethod
def accent() -> str:
def accent() -> QColor:
# NOTE: As of PySide 6.8.0.1, the QPalette.ColorRole.Accent role no longer works on Windows.
# The QPalette.ColorRole.Highlight does for some reason, but is faded on macOS.
if not Palette._palette:
logger.error("[Style] No QPalette set!")
return get_ui_color(ColorType.PRIMARY, UiColor.BLUE)
if not Palette._accent:
Palette._accent = (
f"rgba{QPalette.color(Palette._palette, QPalette.ColorRole.Accent).toTuple()}"
)
return Palette._accent
return QColor.fromString(get_ui_color(ColorType.PRIMARY, UiColor.BLUE))
role = (
QPalette.ColorRole.Highlight
if platform.system() == "Windows"
else QPalette.ColorRole.Accent
)
return QPalette.color(Palette._palette, role)
class ColorType(IntEnum):
src/tagstudio/qt/ts_qt.py
+7
View File
@@ -321,6 +321,13 @@ class QtDriver(DriverMixin, QObject):
pal.setColor(
QPalette.ColorGroup.Inactive, QPalette.ColorRole.ButtonText, QColor("#666666")
)
# BUG: PySide isn't properly setting the link colors on Windows, so this is a fallback.
if platform.system() == "Windows":
pal.setColor(
QPalette.ColorGroup.Normal,
QPalette.ColorRole.Link,
QColor.fromString(get_ui_color(ColorType.PRIMARY, UiColor.BLUE)),
)
Palette.set_palette(pal)
self.app.setPalette(pal)
src/tagstudio/qt/views/stylesheets/stylesheets.py
+6 -6
View File
@@ -74,7 +74,7 @@ def button_style() -> str:
outline: none;
border: solid;
border-width: 2px;
border-color: {Palette.accent()};
border-color: rgba{Palette.accent().toTuple()};
padding: 0px 8px;
}}
QPushButton::disabled{{
@@ -108,7 +108,7 @@ def line_edit_style_main() -> str:
QLineEdit::focus{{
border-style: solid;
border-width: 2px;
border-color: {Palette.accent()};
border-color: rgba{Palette.accent().toTuple()};
padding: 0px 2px;
}}
QLineEdit::disabled{{
@@ -412,7 +412,7 @@ def tag_remove_button_style(
def widget_underline_style() -> str:
return f"""
background: {Palette.accent()};
background: rgba{Palette.accent().toTuple()};
border-radius: 2px;
"""
@@ -475,7 +475,7 @@ def autofill_scroll_top_focus_style(object_name: str = "") -> str:
border-top-right-radius: 6px;
border: solid;
border-width: 2px 2px 0px 2px;
border-color: {Palette.accent()};
border-color: rgba{Palette.accent().toTuple()};
}}
"""
@@ -498,7 +498,7 @@ def autofill_line_edit_style() -> str:
padding: 4px 4px;
border: solid;
border-width: 2px;
border-color: {Palette.accent()};
border-color: rgba{Palette.accent().toTuple()};
}}
"""
@@ -524,7 +524,7 @@ def autofill_line_edit_top_style() -> str:
padding: 4px 4px;
border: solid;
border-width: 0px 2px 2px 2px;
border-color: {Palette.accent()};
border-color: rgba{Palette.accent().toTuple()};
}}
"""
src/tagstudio/qt/views/thumb_button.py
+5 -45
View File
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-3.0-only
import sys
from typing import override
from PySide6 import QtCore
@@ -13,11 +12,12 @@ from PySide6.QtGui import (
QPainter,
QPainterPath,
QPaintEvent,
QPalette,
QPen,
)
from PySide6.QtWidgets import QPushButton, QWidget
from tagstudio.qt.models.palette import Palette
class ThumbButton(QPushButton):
def __init__(self, parent: QWidget, thumb_size: tuple[int, int]) -> None:
@@ -25,30 +25,9 @@ class ThumbButton(QPushButton):
self.thumb_size: tuple[int, int] = thumb_size
self.hovered = False
self.selected = False
self.select_color = Palette.accent()
# NOTE: As of PySide 6.8.0.1, the QPalette.ColorRole.Accent role no longer works on Windows.
# The QPalette.ColorRole.AlternateBase does for some reason, but not on macOS.
self.select_color: QColor
if sys.platform == "win32":
self.select_color = QPalette.color(
self.palette(),
QPalette.ColorGroup.Active,
QPalette.ColorRole.AlternateBase,
)
self.select_color.setHsl(
self.select_color.hslHue(),
self.select_color.hslSaturation(),
max(self.select_color.lightness(), 100),
255,
)
else:
self.select_color = QPalette.color(
self.palette(),
QPalette.ColorGroup.Active,
QPalette.ColorRole.Accent,
)
self.select_color_faded: QColor = QColor(self.select_color)
self.select_color_faded = Palette.accent()
self.select_color_faded.setHsl(
self.select_color_faded.hslHue(),
self.select_color_faded.hslSaturation(),
@@ -56,26 +35,7 @@ class ThumbButton(QPushButton):
127,
)
self.hover_color: QColor
if sys.platform == "win32":
self.hover_color = QPalette.color(
self.palette(),
QPalette.ColorGroup.Active,
QPalette.ColorRole.AlternateBase,
)
self.hover_color.setHsl(
self.hover_color.hslHue(),
self.hover_color.hslSaturation(),
max(self.hover_color.lightness(), 100),
255,
)
else:
self.hover_color = QPalette.color(
self.palette(),
QPalette.ColorGroup.Active,
QPalette.ColorRole.Accent,
)
self.hover_color = Palette.accent()
self.hover_color.setHsl(
self.hover_color.hslHue(),
self.hover_color.hslSaturation(),