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 right margin for last page in a chapter sometimes disappearing when changing font size. Fixes #1292822 [Right margin of text when resize in reader](https://bugs.launchpad.net/calibre/+bug/1292822)

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-17 11:44:15 +05:30
parent 2e40d47b5f
commit 43e325b79e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/viewer/documentview.py
View File

@ -281,11 +281,16 @@ class Document(QWebPage): # {{{
)) ))
force_fullscreen_layout = bool(getattr(last_loaded_path, force_fullscreen_layout = bool(getattr(last_loaded_path,
'is_single_page', False)) 'is_single_page', False))
f = 'true' if force_fullscreen_layout else 'false' self.update_contents_size_for_paged_mode(force_fullscreen_layout)
side_margin = self.javascript('window.paged_display.layout(%s)'%f, typ=int)
def update_contents_size_for_paged_mode(self, force_fullscreen_layout=None):
# Setup the contents size to ensure that there is a right most margin. # Setup the contents size to ensure that there is a right most margin.
# Without this WebKit renders the final column with no margin, as the # Without this WebKit renders the final column with no margin, as the
# columns extend beyond the boundaries (and margin) of body # columns extend beyond the boundaries (and margin) of body
if force_fullscreen_layout is None:
force_fullscreen_layout = self.javascript('window.paged_display.is_full_screen_layout', typ=bool)
f = 'true' if force_fullscreen_layout else 'false'
side_margin = self.javascript('window.paged_display.layout(%s)'%f, typ=int)
mf = self.mainFrame() mf = self.mainFrame()
sz = mf.contentsSize() sz = mf.contentsSize()
scroll_width = self.javascript('document.body.scrollWidth', int) scroll_width = self.javascript('document.body.scrollWidth', int)
@ -354,6 +359,8 @@ class Document(QWebPage): # {{{
return ans[0] if ans[1] else 0.0 return ans[0] if ans[1] else 0.0
if typ == 'string': if typ == 'string':
return unicode(ans.toString()) return unicode(ans.toString())
if typ in {bool, 'bool'}:
return ans.toBool()
return ans return ans
def javaScriptConsoleMessage(self, msg, lineno, msgid): def javaScriptConsoleMessage(self, msg, lineno, msgid):
@ -1104,8 +1111,12 @@ class DocumentView(QWebView): # {{{
def fget(self): def fget(self):
return self.zoomFactor() return self.zoomFactor()
def fset(self, val): def fset(self, val):
oval = self.zoomFactor()
self.setZoomFactor(val) self.setZoomFactor(val)
self.magnification_changed.emit(val) if val != oval:
if self.document.in_paged_mode:
self.document.update_contents_size_for_paged_mode()
self.magnification_changed.emit(val)
return property(fget=fget, fset=fset) return property(fget=fget, fset=fset)
def magnify_fonts(self, amount=None): def magnify_fonts(self, amount=None):