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

Fix #3328 (Scroll past page-break to maintain reading flow)

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-05 11:20:17 -07:00
parent 6eb1036f42
commit 3b3a189b03
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,8 +343,9 @@ class Document(QWebPage):
def width(self):
return self.mainFrame().contentsSize().width() # offsetWidth gives inaccurate results
def load_finished(self, ok):
self.javascript('$("body").css("padding-bottom: 0px")')
def set_bottom_padding(self, amount):
self.javascript('$("body").css("padding-bottom", "%dpx")' % amount)
class EntityDeclarationProcessor(object):
@ -502,7 +503,7 @@ class DocumentView(QWebView):
# An <iframe> finished loading
return
self.loading_url = None
self.document.load_finished(ok)
self.document.set_bottom_padding(0)
self._size_hint = self.document.mainFrame().contentsSize()
scrolled = False
if self.to_bottom:
@ -573,9 +574,13 @@ class DocumentView(QWebView):
if self.manager is not None:
self.manager.next_document()
else:
self.document.set_bottom_padding(0)
opos = self.document.ypos
lower_limit = opos + delta_y
max_y = self.document.height - window_height
if max_y < lower_limit:
self.document.set_bottom_padding(lower_limit - max_y)
max_y = self.document.height - window_height
lower_limit = min(max_y, lower_limit)
if lower_limit > opos:
self.document.scroll_to(self.document.xpos, lower_limit)