From f28024b54151b662d9ae3fadade0187492766698 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sat, 10 Feb 2018 23:11:03 +0000
Subject: [PATCH] Don't use Activate and Move keys for GUI navigation if bound
 to mouse buttons (Fixes #4225, Fixes #4320)

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 400dd7213..3b4ff25a0 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -174,10 +174,25 @@ namespace MWInput
         }
     }
 
+    bool isLeftOrRightButton(int action, ICS::InputControlSystem* ics, int deviceId, bool joystick)
+    {
+        int mouseBinding = ics->getMouseButtonBinding(ics->getControl(action), ICS::Control::INCREASE);
+        if (mouseBinding != ICS_MAX_DEVICE_BUTTONS)
+            return true;
+        int buttonBinding = ics->getJoystickButtonBinding(ics->getControl(action), deviceId, ICS::Control::INCREASE);
+        if (joystick && (buttonBinding == 0 || buttonBinding == 1))
+            return true;
+        return false;
+    }
+
     void InputManager::handleGuiArrowKey(int action)
     {
         if (SDL_IsTextInputActive())
             return;
+
+        if (isLeftOrRightButton(action, mInputBinder, mFakeDeviceID, mJoystickLastUsed))
+            return;
+
         MyGUI::KeyCode key;
         switch (action)
         {
@@ -1115,7 +1130,7 @@ namespace MWInput
     {
         if (MWBase::Environment::get().getWindowManager()->isGuiMode())
         {
-            if (!SDL_IsTextInputActive())
+            if (!SDL_IsTextInputActive() && !isLeftOrRightButton(A_Activate, mInputBinder, mFakeDeviceID, mJoystickLastUsed))
                 MWBase::Environment::get().getWindowManager()->injectKeyPress(MyGUI::KeyCode::Return, 0);
         }
         else if (mControlSwitch["playercontrols"])