dolphinmainwindow: zoom action is now a KToolBarPopupAction

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

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 76e23d4202df6f4bb0c8bce0afc8ff9428b49b2e..e4aea4b61fafa5286591d0bd3e58a1324cefccb3 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -10,16 +10,19 @@
 
 #include <KLocalizedString>
 
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QToolButton>
 
 FilterBar::FilterBar(QWidget *parent)
-    : QWidget(parent)
+    : AnimatedHeightWidget{parent}
 {
+    QWidget *contentsContainer = prepareContentsContainer();
+
     // Create button to lock text when changing folders
-    m_lockButton = new QToolButton(this);
+    m_lockButton = new QToolButton(contentsContainer);
     m_lockButton->setAutoRaise(true);
     m_lockButton->setCheckable(true);
     m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
@@ -27,26 +30,29 @@ FilterBar::FilterBar(QWidget *parent)
     connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
     // Create filter editor
-    m_filterInput = new QLineEdit(this);
+    m_filterInput = new QLineEdit(contentsContainer);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
     m_filterInput->setClearButtonEnabled(true);
-    m_filterInput->setPlaceholderText(i18n("Filter..."));
+    m_filterInput->setPlaceholderText(i18n("Filter…"));
     connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
     // Create close button
-    QToolButton *closeButton = new QToolButton(this);
+    QToolButton *closeButton = new QToolButton(contentsContainer);
     closeButton->setAutoRaise(true);
     closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
     connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
 
     // Apply layout
-    QHBoxLayout *hLayout = new QHBoxLayout(this);
+    QHBoxLayout *hLayout = new QHBoxLayout(contentsContainer);
     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()
@@ -55,7 +61,7 @@ FilterBar::~FilterBar()
 
 void FilterBar::closeFilterBar()
 {
-    hide();
+    setVisible(false, WithAnimation);
     clear();
     if (m_lockButton) {
         m_lockButton->setChecked(false);
@@ -96,10 +102,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()) {
@@ -107,14 +111,35 @@ 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);
 }
+
+int FilterBar::preferredHeight() const
+{
+    return std::max(m_filterInput->sizeHint().height(), m_lockButton->sizeHint().height());
+}
+
+#include "moc_filterbar.cpp"