Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 11:14:02 +02:00
Code Issues Projects Releases Wiki Activity

Only enable dark mode palette when using calibre style since it does not work with the system style

Browse source 
Also dont disable alternating row colors with dark palettes on windows,
since we can control the color.
This commit is contained in:
Kovid Goyal 2019-12-08 08:04:26 +05:30
parent 9d8ad144ff
commit 9d50e774b9
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/calibre/gui2/__init__.py
View file

@ -1032,15 +1032,15 @@ def set_dark_mode_palette(self):
self.set_palette(p)
def setup_styles(self, force_calibre_style):
if iswindows and windows_is_system_dark_mode_enabled():
self.set_dark_mode_palette()
if iswindows or isosx:
using_calibre_style = gprefs['ui_style'] != 'system'
else:
using_calibre_style = os.environ.get('CALIBRE_USE_SYSTEM_THEME', '0') == '0'
if force_calibre_style:
using_calibre_style = True
if iswindows and windows_is_system_dark_mode_enabled() and using_calibre_style:
self.set_dark_mode_palette()
self.using_calibre_style = using_calibre_style
if DEBUG:
prints('Using calibre Qt style:', self.using_calibre_style)
@ -1055,8 +1055,9 @@ def fix_dark_theme_colors(self):
pal = self.palette()
# dark blue is unreadable when using dark backgrounds
pal.setColor(pal.Link, QColor('#6CB4EE'))
# alternating row colors look awful in most dark mode themes
pal.setColor(pal.AlternateBase, pal.color(pal.Base))
if isosx:
# alternating row colors look awful in most dark mode themes
pal.setColor(pal.AlternateBase, pal.color(pal.Base))
if isosx and self.using_calibre_style:
# Workaround for https://bugreports.qt.io/browse/QTBUG-75321
# Buttontext is set to black for some reason
@ -1064,6 +1065,7 @@ def fix_dark_theme_colors(self):
self.set_palette(pal)
def set_palette(self, pal):
self.is_dark_mode_palette = False
self.ignore_palette_changes = True
self.setPalette(pal)
# Needed otherwise Qt does not emit the paletteChanged signal when