Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-05 08:40:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Viewer: Fix a couple of bugs in flow mode. Scrolling to anchors was not working and remembering last read position was not working

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-06 08:46:53 +05:30
parent 995e9ecd79
commit 91438dd8f1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pyj/read_book/paged_mode.pyj
View File

@ -351,7 +351,7 @@ def scroll_to_elem(elem):
scroll_viewport.scroll_into_view(elem) scroll_viewport.scroll_into_view(elem)
scroll_viewport.reset_transforms() # needed for viewport_to_document() scroll_viewport.reset_transforms() # needed for viewport_to_document()
if in_paged_mode: if in_paged_mode():
# Ensure we are scrolled to the column containing elem # Ensure we are scrolled to the column containing elem
# Because of a bug in WebKit's getBoundingClientRect() in column # Because of a bug in WebKit's getBoundingClientRect() in column
@ -373,7 +373,7 @@ def scroll_to_elem(elem):
def snap_to_selection(): def snap_to_selection():
# Ensure that the viewport is positioned at the start of the column # Ensure that the viewport is positioned at the start of the column
# containing the start of the current selection # containing the start of the current selection
if in_paged_mode: if in_paged_mode():
scroll_viewport.reset_transforms() # needed for viewport_to_document() scroll_viewport.reset_transforms() # needed for viewport_to_document()
sel = window.getSelection() sel = window.getSelection()
r = sel.getRangeAt(0).getBoundingClientRect() r = sel.getRangeAt(0).getBoundingClientRect()
@ -390,7 +390,7 @@ def jump_to_cfi(cfi):
# scroll is performed so that the column containing the position # scroll is performed so that the column containing the position
# pointed to by the cfi is the left most column in the viewport # pointed to by the cfi is the left most column in the viewport
cfi_scroll_to(cfi, def(x, y): cfi_scroll_to(cfi, def(x, y):
if in_paged_mode: if in_paged_mode():
scroll_to_xpos(x) scroll_to_xpos(x)
else: else:
scroll_viewport.scroll_to(0, y) scroll_viewport.scroll_to(0, y)
@ -400,7 +400,7 @@ def current_cfi():
# The Conformal Fragment Identifier at the current position, returns # The Conformal Fragment Identifier at the current position, returns
# null if it could not be calculated. # null if it could not be calculated.
ans = None ans = None
if in_paged_mode: if in_paged_mode():
c = current_column_location() c = current_column_location()
for x in c, c - col_and_gap, c + col_and_gap: for x in c, c - col_and_gap, c + col_and_gap:
# Try the current column, the previous column and the next # Try the current column, the previous column and the next
@ -432,7 +432,7 @@ def current_cfi():
def progress_frac(frac): def progress_frac(frac):
# The current scroll position as a fraction between 0 and 1 # The current scroll position as a fraction between 0 and 1
if in_paged_mode: if in_paged_mode():
limit = scroll_viewport.paged_content_width() - scroll_viewport.width() limit = scroll_viewport.paged_content_width() - scroll_viewport.width()
if limit <= 0: if limit <= 0:
return 0.0 return 0.0