Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Viewer: Fix jumping to search result not always working in flow mode. Fixes #1900868 [Private bug](https://bugs.launchpad.net/calibre/+bug/1900868)

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-26 09:09:42 +05:30
parent acd82a0bed
commit ff06cbbae5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pyj/read_book/flow_mode.pyj
View File

@ -21,6 +21,7 @@ from __python__ import bound_methods, hash_literals
# things scroll in the positive block direction. # things scroll in the positive block direction.
from dom import set_css from dom import set_css
from range_utils import wrap_range, unwrap
from read_book.cfi import scroll_to as cfi_scroll_to from read_book.cfi import scroll_to as cfi_scroll_to
from read_book.globals import current_spine_item, get_boss, rtl_page_progression, ltr_page_progression from read_book.globals import current_spine_item, get_boss, rtl_page_progression, ltr_page_progression
from read_book.settings import opts from read_book.settings import opts
@ -598,16 +599,32 @@ def auto_scroll_action(action):
return is_auto_scroll_active() return is_auto_scroll_active()
def closest_preceding_element(p):
while p and not p.scrollIntoView:
p = p.previousSibling or p.parentNode
return p
def ensure_selection_visible(): def ensure_selection_visible():
s = window.getSelection() s = window.getSelection()
if not s.anchorNode:
return
p = s.anchorNode p = s.anchorNode
while p: if not p:
if p.scrollIntoView: return
p.scrollIntoView() p = closest_preceding_element(p)
return if p?.scrollIntoView:
p = p.parentNode p.scrollIntoView()
r = s.getRangeAt(0)
if not r:
return
rect = r.getBoundingClientRect()
if not rect:
return
if rect.top < 0 or rect.top >= window.innerHeight or rect.left < 0 or rect.left >= window.innerWidth:
wrapper = document.createElement('span')
wrap_range(r, wrapper)
wrapper.scrollIntoView()
unwrap(wrapper)
def jump_to_cfi(cfi): def jump_to_cfi(cfi):
# Jump to the position indicated by the specified conformal fragment # Jump to the position indicated by the specified conformal fragment