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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-06-20 10:24:53 +05:30
parent 89724d321d
commit f2ceaa3c63
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ class Document(QWebPage): # {{{
return self.anchor_positions return self.anchor_positions
def switch_to_paged_mode(self, onresize=False): def switch_to_paged_mode(self, onresize=False):
side_margin = self.javascript('paged_display.layout()', typ=int) side_margin = self.javascript('window.paged_display.layout()', typ=int)
# 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
@ -294,7 +294,7 @@ class Document(QWebPage): # {{{
self.mainFrame().setScrollPosition(QPoint(x, y)) self.mainFrame().setScrollPosition(QPoint(x, y))
def jump_to_anchor(self, anchor): def jump_to_anchor(self, anchor):
self.javascript('paged_display.jump_to_anchor("%s")'%anchor) self.javascript('window.paged_display.jump_to_anchor("%s")'%anchor)
def element_ypos(self, elem): def element_ypos(self, elem):
ans, ok = elem.evaluateJavaScript('$(this).offset().top').toInt() ans, ok = elem.evaluateJavaScript('$(this).offset().top').toInt()
@ -340,8 +340,12 @@ class Document(QWebPage): # {{{
def scroll_fraction(self): def scroll_fraction(self):
def fget(self): def fget(self):
if self.in_paged_mode: if self.in_paged_mode:
return self.javascript('paged_display.current_pos()', return self.javascript('''
typ='float') ans = 0.0;
if (window.paged_display) {
ans = window.paged_display.current_pos();
}
ans;''', typ='float')
else: else:
try: try:
return abs(float(self.ypos)/(self.height-self.window_height)) return abs(float(self.ypos)/(self.height-self.window_height))
@ -922,6 +926,8 @@ class DocumentView(QWebView): # {{{
direction, typ), typ='int') direction, typ), typ='int')
if loc > -1: if loc > -1:
self.document.scroll_to(x=loc, y=0) self.document.scroll_to(x=loc, y=0)
if self.manager is not None:
self.manager.scrolled(self.scroll_fraction)
return return
if event.delta() < -14: if event.delta() < -14: