From 644071ff0ce36a3d7a798474880aaa4edbf9ab5a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 5 Oct 2019 10:07:46 +0530 Subject: [PATCH] Viewer: When restoring from fullscreen go back to maximized state if window was maximized when entering full screen. Fixes #1846753 [Window Size not retained when exiting from full screen in ebook-viewer](https://bugs.launchpad.net/calibre/+bug/1846753) --- src/calibre/gui2/viewer/ui.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/viewer/ui.py b/src/calibre/gui2/viewer/ui.py index fe468aeecc..15c55680ed 100644 --- a/src/calibre/gui2/viewer/ui.py +++ b/src/calibre/gui2/viewer/ui.py @@ -66,6 +66,7 @@ class EbookViewer(MainWindow): def __init__(self, open_at=None, continue_reading=None): MainWindow.__init__(self, None) + self.maximized_at_last_fullscreen = False self.pending_open_at = open_at self.base_window_title = _('E-book viewer') self.setWindowTitle(self.base_window_title) @@ -153,9 +154,13 @@ class EbookViewer(MainWindow): # Fullscreen {{{ def set_full_screen(self, on): if on: + self.maximized_at_last_fullscreen = self.isMaximized() self.showFullScreen() else: - self.showNormal() + if self.maximized_at_last_fullscreen: + self.showMaximized() + else: + self.showNormal() def changeEvent(self, ev): if ev.type() == QEvent.WindowStateChange: