GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix macOS clipboard issues (#2900)

Browse source 
* Added double-check of clipboard change when pasting.

* Added comment explaining changes, updated CONTRIBUTORS and about.py
This commit is contained in:
msisovic 2023-12-22 05:18:19 +01:00 committed by GitHub
parent 31aba99641
commit 7f976aaa56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS
View file

@ -153,6 +153,7 @@ Akash Reddy <akashreddy2003@gmail.com>
Lucio Sauer <watermanpaint@posteo.net>
Gustavo Sales <gustavosmendes14@gmail.com>
Shawn M Moore <https://github.com/sartak>
Marko Sisovic <msisovic13@gmail.com>
********************

1
qt/aqt/about.py
View file

@ -188,6 +188,7 @@ def show(mw: aqt.AnkiQt) -> QDialog:
"Jarrett Ye",
"Gustavo Sales",
"Akash Reddy",
"Marko Sisovic",
)
)

7
qt/aqt/editor.py
View file

@ -1403,8 +1403,9 @@ class EditorWebView(AnkiWebView):
# when we detect the user copying from a field, we store the content
# here, and use it when they paste, so we avoid filtering field content
self._internal_field_text_for_paste: str | None = None
self._last_known_clipboard_mime: QMimeData | None = None
clip = self.editor.mw.app.clipboard()
qconnect(clip.dataChanged, self._on_clipboard_change)
clip.dataChanged.connect(self._on_clipboard_change)
gui_hooks.editor_web_view_did_init(self)
def user_cut_or_copied(self) -> None:
@ -1412,6 +1413,7 @@ class EditorWebView(AnkiWebView):
self._internal_field_text_for_paste = None
def _on_clipboard_change(self) -> None:
self._last_known_clipboard_mime = self.editor.mw.app.clipboard().mimeData()
if self._store_field_content_on_next_clipboard_change:
# if the flag was set, save the field data
self._internal_field_text_for_paste = self._get_clipboard_html_for_field()
@ -1444,6 +1446,9 @@ 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
if self._last_known_clipboard_mime != self.editor.mw.app.clipboard().mimeData():
self._on_clipboard_change()
extended = self._wantsExtendedPaste()
if html := self._internal_field_text_for_paste:
print("reuse internal")