Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix system default color palette not selecting dark palette on startup on some windows systems

Browse Source
This commit is contained in:
Kovid Goyal 2024-02-09 11:37:42 +05:30
parent 392215085d
commit d123ff336c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/palette.py
View File

@ -247,13 +247,17 @@ class PaletteManager(QObject):
# Since Qt is using the fusion style anyway, specialize it # Since Qt is using the fusion style anyway, specialize it
self.using_calibre_style = True self.using_calibre_style = True
@property
def use_dark_palette(self):
app = QApplication.instance()
system_is_dark = app.styleHints().colorScheme() == Qt.ColorScheme.Dark
return self.color_palette == 'dark' or (self.color_palette == 'system' and system_is_dark)
def setup_styles(self): def setup_styles(self):
if self.using_calibre_style: if self.using_calibre_style:
app = QApplication.instance() app = QApplication.instance()
system_is_dark = app.styleHints().colorScheme() == Qt.ColorScheme.Dark
app.styleHints().colorSchemeChanged.connect(self.color_scheme_changed) app.styleHints().colorSchemeChanged.connect(self.color_scheme_changed)
use_dark_palette = self.color_palette == 'dark' or (self.color_palette == 'system' and system_is_dark) self.set_dark_mode_palette() if self.use_dark_palette else self.set_light_mode_palette()
self.set_dark_mode_palette() if use_dark_palette else self.set_light_mode_palette()
QApplication.instance().setAttribute(Qt.ApplicationAttribute.AA_SetPalette, True) QApplication.instance().setAttribute(Qt.ApplicationAttribute.AA_SetPalette, True)
if DEBUG: if DEBUG:
@ -371,7 +375,7 @@ QTabBar::tab:only-one {
if DEBUG: if DEBUG:
print('ApplicationPaletteChange event received', file=sys.stderr) print('ApplicationPaletteChange event received', file=sys.stderr)
if self.using_calibre_style: if self.using_calibre_style:
pal = dark_palette() if self.color_palette == 'dark' else light_palette() pal = dark_palette() if self.use_dark_palette else light_palette()
if QApplication.instance().palette().color(QPalette.ColorRole.Window) != pal.color(QPalette.ColorRole.Window): if QApplication.instance().palette().color(QPalette.ColorRole.Window) != pal.color(QPalette.ColorRole.Window):
if DEBUG: if DEBUG:
print('Detected a spontaneous palette change by Qt, reverting it', file=sys.stderr) print('Detected a spontaneous palette change by Qt, reverting it', file=sys.stderr)