Allow control popup menu by up/down keys.

2 files changed, 16 insertions, 0 deletions

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 924fac801..64d05f8ab 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -246,6 +246,10 @@ impHandler0(ok)
         dialog->action(ActionEvent(nullptr, "ok"));
         return true;
     }
+    else if (popupMenu->isPopupVisible())
+    {
+        popupMenu->select();
+    }
     return false;
 }
 
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
index 0fa4d4897..c75d24c36 100644
--- a/src/actions/move.cpp
+++ b/src/actions/move.cpp
@@ -30,6 +30,8 @@
 #include "gui/windows/npcdialog.h"
 #include "gui/windows/outfitwindow.h"
 
+#include "gui/popups/popupmenu.h"
+
 #include "net/playerhandler.h"
 
 #include "debug.h"
@@ -59,6 +61,11 @@ impHandler(moveUp)
 {
     if (inputManager.isActionActive(InputAction::EMOTE))
         return directUp(event);
+    if (popupMenu->isPopupVisible())
+    {
+        popupMenu->moveUp();
+        return true;
+    }
     return closeMoveNpcDialog(false);
 }
 
@@ -66,6 +73,11 @@ impHandler(moveDown)
 {
     if (inputManager.isActionActive(InputAction::EMOTE))
         return directDown(event);
+    if (popupMenu->isPopupVisible())
+    {
+        popupMenu->moveDown();
+        return true;
+    }
     return closeMoveNpcDialog(false);
 }