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

allow getting legacy geometry more flexibly

Browse Source
This commit is contained in:
Kovid Goyal 2022-10-19 16:31:43 +05:30
parent 3335ebafa3
commit 0d8c25f89e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/geometry.py
View File

@ -145,10 +145,10 @@ def _restore_to_new_screen(self: QWidget, s: QScreen, saved_data: dict) -> bool:
return _do_restore(self, s, geometry, saved_data) return _do_restore(self, s, geometry, saved_data)
def _restore_geometry(self: QWidget, prefs: dict, name: str) -> bool: def _restore_geometry(self: QWidget, prefs: dict, name: str, get_legacy_saved_geometry: callable = None) -> bool:
x = prefs.get(f'geometry-of-{name}') x = prefs.get(f'geometry-of-{name}')
if not x: if not x:
old = prefs.get(name) old = get_legacy_saved_geometry() if get_legacy_saved_geometry else prefs.get(name)
if old is not None: if old is not None:
return self.restoreGeometry(old) return self.restoreGeometry(old)
return False return False
@ -179,14 +179,14 @@ def _restore_geometry(self: QWidget, prefs: dict, name: str) -> bool:
screen_debug_has_been_output = False screen_debug_has_been_output = False
def restore_geometry(self: QWidget, prefs: dict, name: str) -> bool: def restore_geometry(self: QWidget, prefs: dict, name: str, get_legacy_saved_geometry: callable = None) -> bool:
global screen_debug_has_been_output global screen_debug_has_been_output
if not screen_debug_has_been_output: if not screen_debug_has_been_output:
screen_debug_has_been_output = True screen_debug_has_been_output = True
debug('Screens currently in system:') debug('Screens currently in system:')
for screen in QApplication.instance().screens(): for screen in QApplication.instance().screens():
debug(screen_as_dict(screen)) debug(screen_as_dict(screen))
if _restore_geometry(self, prefs, name): if _restore_geometry(self, prefs, name, get_legacy_saved_geometry):
return True return True
sz = self.sizeHint() sz = self.sizeHint()
if sz.isValid(): if sz.isValid():