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 reuse internal clipboard for primary selection pasting (#3613)

Browse source 
* Pass down clipboard mode

* Add type annotation
This commit is contained in:
Ben Nguyen 2024-12-08 20:38:52 -08:00 committed by GitHub
parent d6ffaa921f
commit 128f54ed90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qt/aqt/editor.py
View file

@ -1438,24 +1438,28 @@ class EditorWebView(AnkiWebView):
self._store_field_content_on_next_clipboard_change = True self._store_field_content_on_next_clipboard_change = True
self._internal_field_text_for_paste = None self._internal_field_text_for_paste = None
def _on_clipboard_change(self) -> None: def _on_clipboard_change(
self._last_known_clipboard_mime = self._clipboard().mimeData() self, mode: QClipboard.Mode = QClipboard.Mode.Clipboard
) -> None:
self._last_known_clipboard_mime = self._clipboard().mimeData(mode)
if self._store_field_content_on_next_clipboard_change: if self._store_field_content_on_next_clipboard_change:
# if the flag was set, save the field data # if the flag was set, save the field data
self._internal_field_text_for_paste = self._get_clipboard_html_for_field() self._internal_field_text_for_paste = self._get_clipboard_html_for_field(
mode
)
self._store_field_content_on_next_clipboard_change = False self._store_field_content_on_next_clipboard_change = False
elif ( elif self._internal_field_text_for_paste != self._get_clipboard_html_for_field(
self._internal_field_text_for_paste != self._get_clipboard_html_for_field() mode
): ):
# if we've previously saved the field, blank it out if the clipboard state has changed # if we've previously saved the field, blank it out if the clipboard state has changed
self._internal_field_text_for_paste = None self._internal_field_text_for_paste = None
def _get_clipboard_html_for_field(self): def _get_clipboard_html_for_field(self, mode: QClipboard.Mode) -> str | None:
clip = self._clipboard() clip = self._clipboard()
mime = clip.mimeData() mime = clip.mimeData(mode)
assert mime is not None assert mime is not None
if not mime.hasHtml(): if not mime.hasHtml():
return return None
return mime.html() return mime.html()
def onCut(self) -> None: def onCut(self) -> None:
@ -1486,8 +1490,8 @@ class EditorWebView(AnkiWebView):
def _onPaste(self, mode: QClipboard.Mode) -> None: 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
clipboard = self._clipboard() clipboard = self._clipboard()
if self._last_known_clipboard_mime != clipboard.mimeData(): if self._last_known_clipboard_mime != clipboard.mimeData(mode):
self._on_clipboard_change() self._on_clipboard_change(mode)
extended = self._wantsExtendedPaste() extended = self._wantsExtendedPaste()
if html := self._internal_field_text_for_paste: if html := self._internal_field_text_for_paste:
print("reuse internal") print("reuse internal")