From cb5a134080f1368beef87f46d5ed4fd7406a98fc Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 2 Sep 2008 20:01:50 +0000 Subject: [PATCH] don't clear the filterbar when switching between tabs BUG: 169878 svn path=/trunk/KDE/kdebase/apps/; revision=856411 --- src/dolphinviewcontainer.cpp | 1 + src/filterbar.cpp | 7 ++----- src/filterbar.h | 6 ++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 4ff9ab0e4..cccce3fad 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -279,6 +279,7 @@ void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); + m_filterBar->clear(); emit showFilterBarChanged(false); } diff --git a/src/filterbar.cpp b/src/filterbar.cpp index 080dd423f..36a6d5271 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -66,12 +66,9 @@ FilterBar::~FilterBar() { } -void FilterBar::hideEvent(QHideEvent* event) +void FilterBar::clear() { - if (!event->spontaneous()) { - m_filterInput->clear(); - m_filterInput->clearFocus(); - } + m_filterInput->clear(); } void FilterBar::showEvent(QShowEvent* event) diff --git a/src/filterbar.h b/src/filterbar.h index db5d49f89..ef5711fc2 100644 --- a/src/filterbar.h +++ b/src/filterbar.h @@ -39,7 +39,10 @@ class FilterBar : public QWidget public: FilterBar(QWidget* parent = 0); virtual ~FilterBar(); - + + /** Clears the the input field. */ + void clear(); + signals: /** * Signal that reports the name filter has been @@ -53,7 +56,6 @@ signals: void closeRequest(); protected: - virtual void hideEvent(QHideEvent* event); virtual void showEvent(QShowEvent* event); virtual void keyReleaseEvent(QKeyEvent* event); -- 2.47.3