From 21eb095b3b6d634ec4f78e6df5b4799c16c4f54e Mon Sep 17 00:00:00 2001
From: Damien Elmes <dae@users.noreply.github.com>
Date: Tue, 15 Sep 2020 20:31:43 +1000
Subject: [PATCH] Merge pull request #760 from abdnh/extended-drop

Support extended drag & drop
---
 CONTRIBUTORS     | 2 +-
 qt/aqt/editor.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 81b10b43a..222ba577e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -44,7 +44,7 @@ neitrinoweb <github.com/neitrinoweb/>
 Andreas Reis <github.com/rathsky>
 Matt Krump <github.com/mkrump>
 Alexander Presnyakov <flagist0@gmail.com>
-abdo <github.com/ANH25>
+abdo <github.com/abdnh>
 aplaice <plaice.adam+github@gmail.com>
 phwoo <github.com/phwoo> 
 Soren Bjornstad <anki@sorenbjornstad.com>
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 05d57d507..6aeb41743 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -923,7 +923,7 @@ to a cloze type first, via 'Notes>Change Note Type'"""
     def doDrop(self, html, internal):
         def pasteIfField(ret):
             if ret:
-                self.doPaste(html, internal)
+                self.doPaste(html, internal, self.web._wantsExtendedPaste())
 
         p = self.web.mapFromGlobal(QCursor.pos())
         self.web.evalWithCallback(f"focusIfField({p.x()}, {p.y()});", pasteIfField)
@@ -1028,10 +1028,14 @@ class EditorWebView(AnkiWebView):
     def onCopy(self):
         self.triggerPageAction(QWebEnginePage.Copy)
 
-    def _onPaste(self, mode: QClipboard.Mode) -> None:
+    def _wantsExtendedPaste(self) -> bool:
         extended = not (self.editor.mw.app.queryKeyboardModifiers() & Qt.ShiftModifier)
         if self.editor.mw.pm.profile.get("pasteInvert", False):
             extended = not extended
+        return extended
+
+    def _onPaste(self, mode: QClipboard.Mode) -> None:
+        extended = self._wantsExtendedPaste()
         mime = self.editor.mw.app.clipboard().mimeData(mode=mode)
         html, internal = self._processMime(mime)
         if not html: