From 7fbf3f204b2a854562f5329e0260c8ed75a2cb80 Mon Sep 17 00:00:00 2001
From: Enrique Garcia <cquike@arcor.de>
Date: Sat, 31 Aug 2024 22:22:04 +0200
Subject: [PATCH] Support navigation with the keyboard arrows

Signed-off-by: Enrique Garcia <cquike@arcor.de>
---
 qt/qt_common/helpers.hpp    |  4 ++--
 qt/qt_common/map_widget.cpp | 40 ++++++++++++++++++++++++++++++++-----
 qt/qt_common/map_widget.hpp |  9 +++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/qt/qt_common/helpers.hpp b/qt/qt_common/helpers.hpp
index 75cfb07f70..e56484227a 100644
--- a/qt/qt_common/helpers.hpp
+++ b/qt/qt_common/helpers.hpp
@@ -19,9 +19,9 @@ bool IsAltModifier(QMouseEvent const * const e);
 struct Hotkey
 {
   Hotkey() = default;
-  Hotkey(int key, char const * slot) : m_key(key), m_slot(slot) {}
+  Hotkey(QKeySequence const & key, char const * slot) : m_key(key), m_slot(slot) {}
 
-  int m_key = 0;
+  QKeySequence m_key = 0;
   char const * m_slot = nullptr;
 };
 
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index cb6d854ce9..59102ca1ea 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -25,6 +25,12 @@
 #include <QtGui/QAction>
 #include <QtWidgets/QMenu>
 
+// Fraction of the viewport for a move event
+static constexpr float kViewportFractionRoughMove = 0.2;
+
+// Fraction of the viewport for a small move event
+static constexpr float kViewportFractionSmoothMove = 0.1;
+
 namespace qt::common
 {
 //#define ENABLE_AA_SWITCH
@@ -61,12 +67,20 @@ void MapWidget::BindHotkeys(QWidget & parent)
       {Qt::Key_Equal, SLOT(ScalePlus())},
       {Qt::Key_Plus, SLOT(ScalePlus())},
       {Qt::Key_Minus, SLOT(ScaleMinus())},
-      {static_cast<int>(Qt::ALT) + static_cast<int>(Qt::Key_Equal), SLOT(ScalePlusLight())},
-      {static_cast<int>(Qt::ALT) + static_cast<int>(Qt::Key_Plus), SLOT(ScalePlusLight())},
-      {static_cast<int>(Qt::ALT) + static_cast<int>(Qt::Key_Minus), SLOT(ScaleMinusLight())},
+      {Qt::Key_Right, SLOT(MoveRight())},
+      {Qt::Key_Left, SLOT(MoveLeft())},
+      {Qt::Key_Up, SLOT(MoveUp())},
+      {Qt::Key_Down, SLOT(MoveDown())},
+      {Qt::ALT | Qt::Key_Equal, SLOT(ScalePlusLight())},
+      {Qt::ALT | Qt::Key_Plus, SLOT(ScalePlusLight())},
+      {Qt::ALT | Qt::Key_Minus, SLOT(ScaleMinusLight())},
+      {Qt::ALT | Qt::Key_Right, SLOT(MoveRightSmooth())},
+      {Qt::ALT | Qt::Key_Left, SLOT(MoveLeftSmooth())},
+      {Qt::ALT | Qt::Key_Up, SLOT(MoveUpSmooth())},
+      {Qt::ALT | Qt::Key_Down, SLOT(MoveDownSmooth())},
 #ifdef ENABLE_AA_SWITCH
-      {static_cast<int>(Qt::ALT) + static_cast<int>(Qt::Key_A), SLOT(AntialiasingOn())},
-      {static_cast<int>(Qt::ALT) + static_cast<int>(Qt::Key_S), SLOT(AntialiasingOff())},
+      {Qt::ALT | Qt::Key_A, SLOT(AntialiasingOn())},
+      {Qt::ALT | Qt::Key_S, SLOT(AntialiasingOff())},
 #endif
   };
 
@@ -118,6 +132,22 @@ void MapWidget::ScalePlusLight() { m_framework.Scale(Framework::SCALE_MAG_LIGHT,
 
 void MapWidget::ScaleMinusLight() { m_framework.Scale(Framework::SCALE_MIN_LIGHT, true); }
 
+void MapWidget::MoveRight() { m_framework.Move(-kViewportFractionRoughMove, 0, true); }
+
+void MapWidget::MoveRightSmooth() { m_framework.Move(-kViewportFractionSmoothMove, 0, true); }
+
+void MapWidget::MoveLeft() { m_framework.Move(kViewportFractionRoughMove, 0, true); }
+
+void MapWidget::MoveLeftSmooth() { m_framework.Move(kViewportFractionSmoothMove, 0, true); }
+
+void MapWidget::MoveUp() { m_framework.Move(0, -kViewportFractionRoughMove, true); }
+
+void MapWidget::MoveUpSmooth() { m_framework.Move(0, -kViewportFractionSmoothMove, true); }
+
+void MapWidget::MoveDown() { m_framework.Move(0, kViewportFractionRoughMove, true); }
+
+void MapWidget::MoveDownSmooth() { m_framework.Move(0, kViewportFractionSmoothMove, true); }
+
 void MapWidget::AntialiasingOn()
 {
   auto engine = m_framework.GetDrapeEngine();
diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp
index 0de92a4709..01d4ee22ae 100644
--- a/qt/qt_common/map_widget.hpp
+++ b/qt/qt_common/map_widget.hpp
@@ -47,6 +47,15 @@ public slots:
   void ScaleMinus();
   void ScalePlusLight();
   void ScaleMinusLight();
+  void MoveRight();
+  void MoveRightSmooth();
+  void MoveLeft();
+  void MoveLeftSmooth();
+  void MoveUp();
+  void MoveUpSmooth();
+  void MoveDown();
+  void MoveDownSmooth();
+
 
   void ScaleChanged(int action);
   void SliderPressed();