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

E-book viewer: Fix a regression in the previous release that caused the maximum text width setting in full screen mode to be ignored when switching from normal to full screen. Fixes #1467164 [Reader Formatting lost on switch to full screen](https://bugs.launchpad.net/calibre/+bug/1467164)

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-21 10:21:24 +05:30
parent 1d34f92c12
commit 22db9dea76
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/gui2/viewer/main.py
View File

@ -344,7 +344,6 @@ class EbookViewer(MainWindow):
a.setEndValue(QSize(width, height)) a.setEndValue(QSize(width, height))
a.start() a.start()
QTimer.singleShot(3500, self.full_screen_label.hide) QTimer.singleShot(3500, self.full_screen_label.hide)
self.view.document.switch_to_fullscreen_mode()
if self.view.document.fullscreen_clock: if self.view.document.fullscreen_clock:
self.show_clock() self.show_clock()
if self.view.document.fullscreen_pos: if self.view.document.fullscreen_pos:
@ -404,17 +403,6 @@ class EbookViewer(MainWindow):
else: else:
super(EbookViewer, self).showNormal() super(EbookViewer, self).showNormal()
def handle_window_mode_toggle(self):
if self.window_mode_changed:
fs = self.window_mode_changed == 'fullscreen'
self.window_mode_changed = None
if fs:
self.show_full_screen_label()
else:
self.view.document.switch_to_window_mode()
self.view.document.page_position.restore()
self.scrolled(self.view.scroll_fraction)
def goto(self, ref): def goto(self, ref):
if ref: if ref:
tokens = ref.split('.') tokens = ref.split('.')
@ -711,15 +699,24 @@ class EbookViewer(MainWindow):
# There hasn't been a resize event for some time # There hasn't been a resize event for some time
# restore the current page position. # restore the current page position.
self.resize_in_progress = False self.resize_in_progress = False
wmc = self.window_mode_changed wmc, self.window_mode_changed = self.window_mode_changed, None
fs = wmc == 'fullscreen'
if wmc:
# Sets up body text margins, which can be limited in fs mode by a
# separate config option, so must be done before relayout of text
(self.view.document.switch_to_fullscreen_mode if fs else self.view.document.switch_to_window_mode)()
# Re-layout text, must be done before restoring page position
self.view.document.after_resize() self.view.document.after_resize()
if wmc: if wmc:
# This resize is part of a window mode change, special case it # This resize is part of a window mode change, special case it
self.handle_window_mode_toggle() if fs:
self.show_full_screen_label()
self.view.document.page_position.restore()
self.scrolled(self.view.scroll_fraction)
else: else:
if self.isFullScreen(): if self.isFullScreen():
self.relayout_fullscreen_labels() self.relayout_fullscreen_labels()
if not wmc:
pre_footnote_pos = self.pre_footnote_toggle_position() pre_footnote_pos = self.pre_footnote_toggle_position()
if pre_footnote_pos is not None: if pre_footnote_pos is not None:
self.view.document.page_number = pre_footnote_pos self.view.document.page_number = pre_footnote_pos