Merge branch 'master' into kf6

[dolphin.git] / src / filterbar / filterbar.cpp

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index c1fb344b1ef10d7bdac25c8aa4f07c04089e55fe..9d25869ba81e8a9815e56514a060a0a7d5d0dc2b 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -10,13 +10,14 @@
 
 #include <KLocalizedString>
 
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QToolButton>
 
-FilterBar::FilterBar(QWidget* parent) :
-    QWidget(parent)
+FilterBar::FilterBar(QWidget *parent)
+    : QWidget(parent)
 {
     // Create button to lock text when changing folders
     m_lockButton = new QToolButton(this);
@@ -26,14 +27,12 @@ FilterBar::FilterBar(QWidget* parent) :
     m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
     connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
-
     // Create filter editor
     m_filterInput = new QLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
     m_filterInput->setClearButtonEnabled(true);
-    m_filterInput->setPlaceholderText(i18n("Filter..."));
-    connect(m_filterInput, &QLineEdit::textChanged,
-            this, &FilterBar::filterChanged);
+    m_filterInput->setPlaceholderText(i18n("Filter…"));
+    connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
     // Create close button
@@ -44,11 +43,14 @@ FilterBar::FilterBar(QWidget* parent) :
     connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
 
     // Apply layout
-    QHBoxLayout* hLayout = new QHBoxLayout(this);
+    QHBoxLayout *hLayout = new QHBoxLayout(this);
     hLayout->setContentsMargins(0, 0, 0, 0);
     hLayout->addWidget(m_lockButton);
     hLayout->addWidget(m_filterInput);
     hLayout->addWidget(closeButton);
+
+    setTabOrder(m_lockButton, closeButton);
+    setTabOrder(closeButton, m_filterInput);
 }
 
 FilterBar::~FilterBar()
@@ -91,17 +93,15 @@ void FilterBar::slotToggleLockButton(bool checked)
     }
 }
 
-void FilterBar::showEvent(QShowEvent* event)
+void FilterBar::showEvent(QShowEvent *event)
 {
     if (!event->spontaneous()) {
         m_filterInput->setFocus();
     }
 }
 
-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()) {
@@ -109,15 +109,30 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
         } else {
             m_filterInput->clear();
         }
-        break;
+        return;
 
     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;
     }
+
+    QWidget::keyPressEvent(event);
 }
 
+#include "moc_filterbar.cpp"