From 74e806d9745e6f14be6cc4f04320586b3df3cace Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:14:26 +0200
Subject: [PATCH] Additionally use movement keys (default WASD) to navigate GUI
 buttons

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 29 +++++++++++++++++++++++++
 apps/openmw/mwinput/inputmanagerimp.hpp |  1 +
 2 files changed, 30 insertions(+)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 6f0b3b1b4..0637b6d83 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -174,6 +174,29 @@ namespace MWInput
         }
     }
 
+    void InputManager::handleGuiArrowKey(int action)
+    {
+        MyGUI::KeyCode key;
+        switch (action)
+        {
+        case A_MoveLeft:
+            key = MyGUI::KeyCode::ArrowLeft;
+            break;
+        case A_MoveRight:
+            key = MyGUI::KeyCode::ArrowRight;
+            break;
+        case A_MoveForward:
+            key = MyGUI::KeyCode::ArrowUp;
+            break;
+        case A_MoveBackward:
+        default:
+            key = MyGUI::KeyCode::ArrowDown;
+            break;
+        }
+
+        MWBase::Environment::get().getWindowManager()->injectKeyPress(key, 0);
+    }
+
     void InputManager::channelChanged(ICS::Channel* channel, float currentValue, float previousValue)
     {
         resetIdleTime ();
@@ -235,6 +258,12 @@ namespace MWInput
                 resetIdleTime();
                 activate();
                 break;
+            case A_MoveLeft:
+            case A_MoveRight:
+            case A_MoveForward:
+            case A_MoveBackward:
+                handleGuiArrowKey(action);
+                break;
             case A_Journal:
                 toggleJournal ();
                 break;
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 8809f44cd..cba7fc743 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -214,6 +214,7 @@ namespace MWInput
         void updateIdleTime(float dt);
 
         void setPlayerControlsEnabled(bool enabled);
+        void handleGuiArrowKey(int action);
 
         void updateCursorMode();