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 --open-at sometimes giving inaccurate results (depends on speed of book loading)

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-26 08:32:36 +05:30
parent 379b82cd00
commit 78976ee9d7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/viewer/main.py
View File

@ -91,6 +91,7 @@ class EbookViewer(MainWindow):
self.pending_reference = None self.pending_reference = None
self.pending_bookmark = None self.pending_bookmark = None
self.pending_restore = False self.pending_restore = False
self.pending_goto_page = None
self.cursor_hidden = False self.cursor_hidden = False
self.existing_bookmarks= [] self.existing_bookmarks= []
self.selected_text = None self.selected_text = None
@ -738,6 +739,9 @@ class EbookViewer(MainWindow):
if len(self.page_position_on_footnote_toggle) % 2 == 1: if len(self.page_position_on_footnote_toggle) % 2 == 1:
self.page_position_on_footnote_toggle[-1] = self.page_position_on_footnote_toggle[-1]._replace( self.page_position_on_footnote_toggle[-1] = self.page_position_on_footnote_toggle[-1]._replace(
after_resize_page_number=self.view.document.page_number) after_resize_page_number=self.view.document.page_number)
if self.pending_goto_page is not None:
pos, self.pending_goto_page = self.pending_goto_page, None
self.goto_page(pos, loaded_check=False)
def update_page_number(self): def update_page_number(self):
self.set_page_number(self.view.document.scroll_fraction) self.set_page_number(self.view.document.scroll_fraction)
@ -916,7 +920,10 @@ class EbookViewer(MainWindow):
open_at = self.pos.maximum() open_at = self.pos.maximum()
if open_at < self.pos.minimum(): if open_at < self.pos.minimum():
open_at = self.pos.minimum() open_at = self.pos.minimum()
self.goto_page(open_at, loaded_check=False) if self.resize_in_progress:
self.pending_goto_page = open_at
else:
self.goto_page(open_at, loaded_check=False)
def set_vscrollbar_value(self, pagenum): def set_vscrollbar_value(self, pagenum):
self.vertical_scrollbar.blockSignals(True) self.vertical_scrollbar.blockSignals(True)