From f3b0afcc624c6fb2ff259cf34e819cc2c651da67 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 25 Sep 2024 20:58:43 +1000 Subject: [PATCH] Revert "Fix pasting from the primary selection (#3413)" This reverts commit 0a879bd2ed7b2fe75ad178f8cbe078fb974bcbca. Closes #3435 --- qt/aqt/editor.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index 522fec329..975780e4e 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -1453,33 +1453,19 @@ class EditorWebView(AnkiWebView): return not strip_html def _onPaste(self, mode: QClipboard.Mode) -> None: - # Since _on_clipboard_change doesn't always trigger properly on macOS, - # we do a double check if any changes were made before pasting + # Since _on_clipboard_change doesn't always trigger properly on macOS, we do a double check if any changes were made before pasting if self._last_known_clipboard_mime != self.editor.mw.app.clipboard().mimeData(): self._on_clipboard_change() extended = self._wantsExtendedPaste() - - def reuse_internal(): + if html := self._internal_field_text_for_paste: print("reuse internal") - if html := self._internal_field_text_for_paste: - self.editor.doPaste(html, True, extended) - return True - return False - - def use_clipboard(): + self.editor.doPaste(html, True, extended) + else: print("use clipboard") mime = self.editor.mw.app.clipboard().mimeData(mode=mode) html, internal = self._processMime(mime, extended) if html: self.editor.doPaste(html, internal, extended) - return True - return False - - if mode == QClipboard.Mode.Selection: - if not use_clipboard(): - reuse_internal() - else: - reuse_internal() def onPaste(self) -> None: self._onPaste(QClipboard.Mode.Clipboard)