[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] src: Track search mode in variable
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2018-09-27 10:57:37
Message-ID: E1g5TzF-0002HP-TB () code ! kde ! org
[Download RAW message or body]

Git commit be077d3a0cde5b461fd6d4e7d73054538b44470b by Kai Uwe Broulik.
Committed on 27/09/2018 at 10:57.
Pushed by broulik into branch 'master'.

Track search mode in variable

Rather than relying on a widget being visible which might not be the case for e.g. non-active tabs

Differential Revision: https://phabricator.kde.org/D15774

M  +4    -1    src/dolphinviewcontainer.cpp
M  +1    -0    src/dolphinviewcontainer.h

https://commits.kde.org/dolphin/be077d3a0cde5b461fd6d4e7d73054538b44470b

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 71a1ae872f..5978ae938c 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -56,6 +56,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     m_urlNavigator(nullptr),
     m_emptyTrashButton(nullptr),
     m_searchBox(nullptr),
+    m_searchModeEnabled(false),
     m_messageWidget(nullptr),
     m_view(nullptr),
     m_filterBar(nullptr),
@@ -378,11 +379,13 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         }
         m_urlNavigator->setLocationUrl(url);
     }
+
+    m_searchModeEnabled = enabled;
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
 {
-    return m_searchBox->isVisible();
+    return m_searchModeEnabled;
 }
 
 QString DolphinViewContainer::placesText() const
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 409aecfcfa..f33a5a1186 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -331,6 +331,7 @@ private:
     KUrlNavigator* m_urlNavigator;
     QPushButton* m_emptyTrashButton;
     DolphinSearchBox* m_searchBox;
+    bool m_searchModeEnabled;
     KMessageWidget* m_messageWidget;
 
     DolphinView* m_view;
[prev in list] [next in list] [prev in thread] [next in thread]