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

Workaround bug in Qt WebKit that causes innerHeight to sometimes erroneously return 0

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-10 17:44:48 -07:00
parent bb4062a84a
commit 89639ac509
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.yaml
View File

@ -20,7 +20,7 @@
description: > description: >
Now calibre will automatically check for updated versions of the recipes used to Now calibre will automatically check for updated versions of the recipes used to
download the builting news sources. As a result, there is no need to upgrade calibre download the builting news sources. As a result, there is no need to upgrade calibre
just for recipe fixes. Note that you stil have to upgrade to get access to new just for recipe fixes. Note that you still have to upgrade to get access to new
news sources. news sources.
type: major type: major

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

@ -344,7 +344,10 @@ class Document(QWebPage):
@property @property
def height(self): def height(self):
return self.javascript('document.body.offsetHeight', 'int') # contentsSize gives inaccurate results ans = self.javascript('document.body.offsetHeight', 'int') # contentsSize gives inaccurate results
if ans == 0:
ans = self.mainFrame().contentsSize().height()
return ans
@property @property
def width(self): def width(self):
@ -489,6 +492,7 @@ class DocumentView(QWebView):
self.manager.load_started() self.manager.load_started()
self.loading_url = QUrl.fromLocalFile(path) self.loading_url = QUrl.fromLocalFile(path)
#self.setContent(QByteArray(html.encode(path.encoding)), mt, QUrl.fromLocalFile(path)) #self.setContent(QByteArray(html.encode(path.encoding)), mt, QUrl.fromLocalFile(path))
#open('/tmp/t.html', 'wb').write(html.encode(path.encoding))
self.setHtml(html, self.loading_url) self.setHtml(html, self.loading_url)
self.turn_off_internal_scrollbars() self.turn_off_internal_scrollbars()
@ -585,8 +589,8 @@ class DocumentView(QWebView):
else: else:
self.document.set_bottom_padding(0) self.document.set_bottom_padding(0)
opos = self.document.ypos opos = self.document.ypos
lower_limit = opos + delta_y lower_limit = opos + delta_y # Max value of top y co-ord after scrolling
max_y = self.document.height - window_height max_y = self.document.height - window_height # The maximum possible top y co-ord
if max_y < lower_limit: if max_y < lower_limit:
self.document.set_bottom_padding(lower_limit - max_y) self.document.set_bottom_padding(lower_limit - max_y)
max_y = self.document.height - window_height max_y = self.document.height - window_height