From 531e7ac58677dc44fe94c433d2d979caed8710dc Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Fri, 22 Sep 2017 23:25:20 +0200
Subject: [PATCH] Allow drag-and-drop to be cancelled (Esc or Inventory key)

---
 apps/openmw/mwgui/draganddrop.cpp       |  2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp  | 14 +++++++++++++-
 apps/openmw/mwinput/inputmanagerimp.cpp |  6 +++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/draganddrop.cpp b/apps/openmw/mwgui/draganddrop.cpp
index fa17d974d..fe0ad3374 100644
--- a/apps/openmw/mwgui/draganddrop.cpp
+++ b/apps/openmw/mwgui/draganddrop.cpp
@@ -125,6 +125,8 @@ void DragAndDrop::finish()
 {
     mIsOnDragAndDrop = false;
     mSourceSortModel->clearDragItems();
+    // since mSourceView doesn't get updated in drag()
+    MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
 
     MyGUI::Gui::getInstance().destroyWidget(mDraggedWidget);
     mDraggedWidget = 0;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2d17db643..4964af7d8 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -755,7 +755,14 @@ namespace MWGui
         mGarbageDialogs.push_back(dialog);
     }
 
-    void WindowManager::exitCurrentGuiMode() {
+    void WindowManager::exitCurrentGuiMode()
+    {
+        if (mDragAndDrop && mDragAndDrop->mIsOnDragAndDrop)
+        {
+            mDragAndDrop->finish();
+            return;
+        }
+
         switch(mGuiModes.back()) {
             case GM_QuickKeysMenu:
                 mQuickKeysMenu->exit();
@@ -1247,6 +1254,11 @@ namespace MWGui
 
     void WindowManager::popGuiMode()
     {
+        if (mDragAndDrop && mDragAndDrop->mIsOnDragAndDrop)
+        {
+            mDragAndDrop->finish();
+        }
+
         if (!mGuiModes.empty())
         {
             mGuiModeStates[mGuiModes.back()].update(false);
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 33f1edb6c..3ed259c58 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -177,13 +177,13 @@ namespace MWInput
 
     void InputManager::channelChanged(ICS::Channel* channel, float currentValue, float previousValue)
     {
-        if (mDragDrop)
-            return;
-
         resetIdleTime ();
 
         int action = channel->getNumber();
 
+        if (mDragDrop && action != A_GameMenu && action != A_Inventory)
+            return;
+
         if((previousValue == 1 || previousValue == 0) && (currentValue==1 || currentValue==0))
         {
             //Is a normal button press, so don't change it at all