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 #1033430 (line scrolling do not stop at page break in paged mode)

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-07 10:47:43 +05:30
parent 08f38df9b9
commit de21068e72
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1036,14 +1036,14 @@ class DocumentView(QWebView): # {{{
if not self.handle_key_press(event): if not self.handle_key_press(event):
return QWebView.keyPressEvent(self, event) return QWebView.keyPressEvent(self, event)
def paged_col_scroll(self, forward=True): def paged_col_scroll(self, forward=True, scroll_past_end=True):
dir = 'next' if forward else 'previous' dir = 'next' if forward else 'previous'
loc = self.document.javascript( loc = self.document.javascript(
'paged_display.%s_col_location()'%dir, typ='int') 'paged_display.%s_col_location()'%dir, typ='int')
if loc > -1: if loc > -1:
self.document.scroll_to(x=loc, y=0) self.document.scroll_to(x=loc, y=0)
self.manager.scrolled(self.document.scroll_fraction) self.manager.scrolled(self.document.scroll_fraction)
else: elif scroll_past_end:
(self.manager.next_document() if forward else (self.manager.next_document() if forward else
self.manager.previous_document()) self.manager.previous_document())
@ -1059,7 +1059,8 @@ class DocumentView(QWebView): # {{{
self.is_auto_repeat_event = False self.is_auto_repeat_event = False
elif key == 'Down': elif key == 'Down':
if self.document.in_paged_mode: if self.document.in_paged_mode:
self.paged_col_scroll() self.paged_col_scroll(scroll_past_end=not
self.document.line_scrolling_stops_on_pagebreaks)
else: else:
if (not self.document.line_scrolling_stops_on_pagebreaks and if (not self.document.line_scrolling_stops_on_pagebreaks and
self.document.at_bottom): self.document.at_bottom):
@ -1068,7 +1069,8 @@ class DocumentView(QWebView): # {{{
self.scroll_by(y=15) self.scroll_by(y=15)
elif key == 'Up': elif key == 'Up':
if self.document.in_paged_mode: if self.document.in_paged_mode:
self.paged_col_scroll(forward=False) self.paged_col_scroll(forward=False, scroll_past_end=not
self.document.line_scrolling_stops_on_pagebreaks)
else: else:
if (not self.document.line_scrolling_stops_on_pagebreaks and if (not self.document.line_scrolling_stops_on_pagebreaks and
self.document.at_top): self.document.at_top):