FilterBar: improve keyboard behavior and tab ordering

With this MR, when the filterbar has the keyboard focus:
- pressing the Tab key moves the keyboard focus to the view
- pressing the Down, PageDown, Up and PageUp keys moves the focus to the view and emulate pressing the same key in it (you can navigate directly from the filterbar)

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 76e23d4202df6f4bb0c8bce0afc8ff9428b49b2e..e24025c5b9621517bcc5f615f5a9319bf8f8e07d 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -10,6 +10,7 @@
 
 #include <KLocalizedString>
 
 
 #include <KLocalizedString>
 

+#include <QApplication>

 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLineEdit>


@@ -47,6 +48,9 @@ FilterBar::FilterBar(QWidget *parent)
     hLayout->addWidget(m_lockButton);
     hLayout->addWidget(m_filterInput);
     hLayout->addWidget(closeButton);
     hLayout->addWidget(m_lockButton);
     hLayout->addWidget(m_filterInput);
     hLayout->addWidget(closeButton);

+
+    setTabOrder(m_lockButton, closeButton);
+    setTabOrder(closeButton, m_filterInput);

 }
 
 FilterBar::~FilterBar()
 }
 
 FilterBar::~FilterBar()


@@ -96,10 +100,8 @@ void FilterBar::showEvent(QShowEvent *event)
     }
 }
 
     }
 }
 

-void FilterBar::keyReleaseEvent(QKeyEvent *event)
+void FilterBar::keyPressEvent(QKeyEvent *event)

 {
 {

-    QWidget::keyReleaseEvent(event);
-

     switch (event->key()) {
     case Qt::Key_Escape:
         if (m_filterInput->text().isEmpty()) {
     switch (event->key()) {
     case Qt::Key_Escape:
         if (m_filterInput->text().isEmpty()) {


@@ -107,14 +109,28 @@ void FilterBar::keyReleaseEvent(QKeyEvent *event)
         } else {
             m_filterInput->clear();
         }
         } else {
             m_filterInput->clear();
         }

-        break;
+        return;

 
     case Qt::Key_Enter:
     case Qt::Key_Return:
         Q_EMIT focusViewRequest();
 
     case Qt::Key_Enter:
     case Qt::Key_Return:
         Q_EMIT focusViewRequest();

-        break;
+        return;
+
+    case Qt::Key_Down:
+    case Qt::Key_PageDown:
+    case Qt::Key_Up:
+    case Qt::Key_PageUp: {
+        Q_EMIT focusViewRequest();
+        QWidget *focusWidget = QApplication::focusWidget();
+        if (focusWidget && focusWidget != this) {
+            QApplication::sendEvent(focusWidget, event);
+        }
+        return;
+    }

 
     default:
         break;
     }
 
     default:
         break;
     }

+
+    QWidget::keyPressEvent(event);

 }
 }

diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h
index 8a0b814311b07e3df3ad07595301e9a3383124ea..3530558839c0284e8f8cfa67f9e12e0ff9608b5e 100644 (file)
--- a/src/filterbar/filterbar.h
+++ b/src/filterbar/filterbar.h
@@ -62,7 +62,7 @@ Q_SIGNALS:
 
 protected:
     void showEvent(QShowEvent *event) override;
 
 protected:
     void showEvent(QShowEvent *event) override;

-    void keyReleaseEvent(QKeyEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;

 
 private:
     QLineEdit *m_filterInput;
 
 private:
     QLineEdit *m_filterInput;