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

Edit book: Fix a regression in the previous release that caused poor performance when editing large files. Fixes #1889047 [Calibre 4.21 editor hangs (randomly?) in Windows 10](https://bugs.launchpad.net/calibre/+bug/1889047)

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-29 10:24:08 +05:30
parent 24806cdf08
commit 14ba9d1461
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/tweak_book/boss.py
View File

@ -1493,19 +1493,29 @@ class Boss(QObject):
finally: finally:
self.ignore_preview_to_editor_sync = False self.ignore_preview_to_editor_sync = False
def sync_preview_to_editor(self): def do_sync_preview_to_editor(self, wait_for_highlight_to_finish=False):
' Sync the position of the preview panel to the current cursor position in the current editor '
if self.ignore_preview_to_editor_sync: if self.ignore_preview_to_editor_sync:
return return
ed = self.gui.central.current_editor ed = self.gui.central.current_editor
if ed is not None: if ed is not None:
name = editor_name(ed) name = editor_name(ed)
if name is not None and getattr(ed, 'syntax', None) == 'html': if name is not None and getattr(ed, 'syntax', None) == 'html':
hl = getattr(ed, 'highlighter', None)
if wait_for_highlight_to_finish:
if getattr(hl, 'is_working', False):
QTimer.singleShot(75, self.sync_preview_to_editor_on_highlight_finish)
return
ct = ed.current_tag() ct = ed.current_tag()
self.gui.preview.sync_to_editor(name, ct) self.gui.preview.sync_to_editor(name, ct)
hl = getattr(ed, 'highlighter', None)
if hl is not None and hl.is_working: if hl is not None and hl.is_working:
QTimer.singleShot(75, self.sync_preview_to_editor) QTimer.singleShot(75, self.sync_preview_to_editor_on_highlight_finish)
def sync_preview_to_editor(self):
' Sync the position of the preview panel to the current cursor position in the current editor '
self.do_sync_preview_to_editor()
def sync_preview_to_editor_on_highlight_finish(self):
self.do_sync_preview_to_editor(wait_for_highlight_to_finish=True)
def show_partial_cfi_in_editor(self, name, cfi): def show_partial_cfi_in_editor(self, name, cfi):
editor = self.edit_file(name, 'html') editor = self.edit_file(name, 'html')