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

Fix for viewer window going off screen even when not restoring window geometry

Browse Source
This commit is contained in:
Kovid Goyal 2020-02-17 09:49:39 +05:30
parent 1ba8e64468
commit e9a899a9fa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,13 +978,15 @@ class Application(QApplication):
if not geom: if not geom:
return return
restored = widget.restoreGeometry(geom) restored = widget.restoreGeometry(geom)
return restored
def ensure_window_on_screen(self, widget):
screen_rect = self.desktop().availableGeometry(widget) screen_rect = self.desktop().availableGeometry(widget)
if not widget.geometry().intersects(screen_rect): if not widget.geometry().intersects(screen_rect):
w = min(widget.width(), screen_rect.width() - 10) w = min(widget.width(), screen_rect.width() - 10)
h = min(widget.height(), screen_rect.height() - 10) h = min(widget.height(), screen_rect.height() - 10)
widget.resize(w, h) widget.resize(w, h)
widget.move((screen_rect.width() - w) // 2, (screen_rect.height() - h) // 2) widget.move((screen_rect.width() - w) // 2, (screen_rect.height() - h) // 2)
return restored
def setup_ui_font(self): def setup_ui_font(self):
f = QFont(QApplication.font()) f = QFont(QApplication.font())

2
src/calibre/gui2/viewer/ui.py
View File

@ -537,6 +537,8 @@ class EbookViewer(MainWindow):
geom = vprefs['main_window_geometry'] geom = vprefs['main_window_geometry']
if geom and get_session_pref('remember_window_geometry', default=False): if geom and get_session_pref('remember_window_geometry', default=False):
QApplication.instance().safe_restore_geometry(self, geom) QApplication.instance().safe_restore_geometry(self, geom)
else:
QApplication.instance().ensure_window_on_screen(self)
if state: if state:
self.restoreState(state, self.MAIN_WINDOW_STATE_VERSION) self.restoreState(state, self.MAIN_WINDOW_STATE_VERSION)
self.inspector_dock.setVisible(False) self.inspector_dock.setVisible(False)