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

Use a dedicated callback for ensuring search result visible

Browse Source 
It clears the saved timer id
This commit is contained in:
Kovid Goyal 2021-06-03 09:40:06 +05:30
parent 86183fd9f3
commit 488ffb2877
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pyj/read_book/iframe.pyj
View File

@ -764,10 +764,11 @@ class IframeBoss:
x, y = scroll_viewport.x(), scroll_viewport.y() x, y = scroll_viewport.x(), scroll_viewport.y()
if select_search_result(sr): if select_search_result(sr):
self.ensure_selection_boundary_visible() self.ensure_selection_boundary_visible()
if from_load and current_layout_mode() is 'paged': need_workaround = from_load and current_layout_mode() is 'paged'
if need_workaround:
# workaround bug in chrome where sizes are incorrect in paged # workaround bug in chrome where sizes are incorrect in paged
# mode on initial load for some books # mode on initial load for some books
self.load_search_result_timer = window.setTimeout(self.ensure_selection_boundary_visible, 750) self.load_search_result_timer = window.setTimeout(self.ensure_search_result_visible, 750)
if self.full_book_search_in_progress and not self.full_book_search_in_progress.first_result_shown and sr.on_discovery: if self.full_book_search_in_progress and not self.full_book_search_in_progress.first_result_shown and sr.on_discovery:
discovered = False discovered = False
if progress_frac() >= self.full_book_search_in_progress.progress_frac_at_start or current_spine_item().index is not self.full_book_search_in_progress.start_spine_index: if progress_frac() >= self.full_book_search_in_progress.progress_frac_at_start or current_spine_item().index is not self.full_book_search_in_progress.start_spine_index:
@ -779,6 +780,13 @@ class IframeBoss:
else: else:
self.send_message('search_result_not_found', search_result=data.search_result) self.send_message('search_result_not_found', search_result=data.search_result)
def ensure_search_result_visible(self):
self.load_search_result_timer = None
sel = window.getSelection()
if sel.isCollapsed or sel.rangeCount is 0:
return
self.ensure_selection_boundary_visible()
def set_reference_mode(self, data): def set_reference_mode(self, data):
self.reference_mode_enabled = data.enabled self.reference_mode_enabled = data.enabled
if data.enabled: if data.enabled: