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

Windows: Fix window titlebars not dark in dark mode

Browse Source 
Sadly changing light/dark mode does not change the titlebars, I assume
this will be in Qt 6.4.
This commit is contained in:
Kovid Goyal 2022-07-14 14:28:50 +05:30
parent 41ade135aa
commit 8b91c0e015
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/__init__.py
View File

@ -1043,7 +1043,10 @@ class Application(QApplication):
shutdown_signal_received = pyqtSignal() shutdown_signal_received = pyqtSignal()
palette_changed = pyqtSignal() palette_changed = pyqtSignal()
def __init__(self, args, force_calibre_style=False, override_program_name=None, headless=False, color_prefs=gprefs, windows_app_uid=None): def __init__(self, args=(), force_calibre_style=False, override_program_name=None, headless=False, color_prefs=gprefs, windows_app_uid=None):
if not args:
args = sys.argv[:1]
args = [args[0]]
if ismacos and not headless: if ismacos and not headless:
from calibre_extensions.cocoa import set_appearance from calibre_extensions.cocoa import set_appearance
if gprefs['color_palette'] != 'system': if gprefs['color_palette'] != 'system':
@ -1074,11 +1077,18 @@ class Application(QApplication):
if override_program_name: if override_program_name:
args = [override_program_name] + args[1:] args = [override_program_name] + args[1:]
if headless: if headless:
if not args:
args = sys.argv[:1]
args.extend(['-platformpluginpath', plugins_loc, '-platform', 'headless']) args.extend(['-platformpluginpath', plugins_loc, '-platform', 'headless'])
else:
if iswindows:
# passing darkmode=1 turns on dark window frames when windows
# is dark and darkmode=2 makes everything dark, but we have our
# own dark mode implementation when using calibre style so
# prefer that and use darkmode=1
if gprefs['ui_style'] == 'system' and not force_calibre_style:
args.extend(['-platform', 'windows:darkmode=2'])
else:
args.extend(['-platform', 'windows:darkmode=1'])
self.headless = headless self.headless = headless
qargs = [i.encode('utf-8') if isinstance(i, str) else i for i in args]
from calibre_extensions import progress_indicator from calibre_extensions import progress_indicator
self.pi = progress_indicator self.pi = progress_indicator
QApplication.setOrganizationName('calibre-ebook.com') QApplication.setOrganizationName('calibre-ebook.com')
@ -1088,7 +1098,7 @@ class Application(QApplication):
if override_program_name and hasattr(QApplication, 'setDesktopFileName'): if override_program_name and hasattr(QApplication, 'setDesktopFileName'):
QApplication.setDesktopFileName(override_program_name) QApplication.setDesktopFileName(override_program_name)
QApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True) # needed for webengine QApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True) # needed for webengine
QApplication.__init__(self, qargs) QApplication.__init__(self, args)
self.original_palette = self.palette() self.original_palette = self.palette()
self.original_palette_modified = fix_palette_colors(self.original_palette) self.original_palette_modified = fix_palette_colors(self.original_palette)
if iswindows: if iswindows: