From 4bd05739c0d41c4fd4aa0aa7455ba472ba8eb1b5 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Tue, 4 Apr 2017 18:54:47 +0800
Subject: [PATCH] enable Ctrl+J and Ctrl+K navigation in VNotebookSelector

---
 src/vnotebookselector.cpp | 54 ++++++++++++++++++++++++++++++++++++++-
 src/vnotebookselector.h   |  1 +
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/vnotebookselector.cpp b/src/vnotebookselector.cpp
index e9a8d44b..3ef2b52f 100644
--- a/src/vnotebookselector.cpp
+++ b/src/vnotebookselector.cpp
@@ -39,6 +39,7 @@ VNotebookSelector::VNotebookSelector(VNote *vnote, QWidget *p_parent)
     setView(m_listWidget);
 
     m_listWidget->viewport()->installEventFilter(this);
+    m_listWidget->installEventFilter(this);
 
     initActions();
 
@@ -327,7 +328,12 @@ void VNotebookSelector::requestPopupListContextMenu(QPoint p_pos)
 
 bool VNotebookSelector::eventFilter(QObject *watched, QEvent *event)
 {
-    if (event->type() == QEvent::MouseButtonRelease) {
+    QEvent::Type type = event->type();
+    if (type == QEvent::KeyPress && watched == m_listWidget) {
+        if (handlePopupKeyPress(static_cast<QKeyEvent *>(event))) {
+            return true;
+        }
+    } else if (type == QEvent::MouseButtonRelease) {
         if (static_cast<QMouseEvent *>(event)->button() == Qt::RightButton) {
             return true;
         }
@@ -427,3 +433,49 @@ bool VNotebookSelector::handleKeyNavigation(int p_key, bool &p_succeed)
     }
     return ret;
 }
+
+bool VNotebookSelector::handlePopupKeyPress(QKeyEvent *p_event)
+{
+    int key = p_event->key();
+    int modifiers = p_event->modifiers();
+    switch (key) {
+    case Qt::Key_BracketLeft:
+    {
+        if (modifiers == Qt::ControlModifier) {
+            p_event->accept();
+            hidePopup();
+            return true;
+        }
+        break;
+    }
+
+    case Qt::Key_J:
+    {
+        if (modifiers == Qt::ControlModifier) {
+            p_event->accept();
+            QKeyEvent *downEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Down,
+                                                 Qt::NoModifier);
+            QCoreApplication::postEvent(m_listWidget, downEvent);
+            return true;
+        }
+        break;
+    }
+
+    case Qt::Key_K:
+    {
+        if (modifiers == Qt::ControlModifier) {
+            p_event->accept();
+            QKeyEvent *upEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Up,
+                                               Qt::NoModifier);
+            QCoreApplication::postEvent(m_listWidget, upEvent);
+            return true;
+        }
+        break;
+    }
+
+    default:
+        break;
+    }
+
+    return false;
+}
diff --git a/src/vnotebookselector.h b/src/vnotebookselector.h
index 43d7acee..b942b53d 100644
--- a/src/vnotebookselector.h
+++ b/src/vnotebookselector.h
@@ -70,6 +70,7 @@ private:
     // @p_index is the idnex of QComboBox.
     inline VNotebook *getNotebookFromComboIndex(int p_index);
     void resizeListWidgetToContent();
+    bool handlePopupKeyPress(QKeyEvent *p_event);
 
     VNote *m_vnote;
     QVector<VNotebook *> &m_notebooks;