diff options
| author | Ismael Asensio <[email protected]> | 2019-10-03 22:00:24 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2019-10-03 22:05:13 +0200 |
| commit | 8599a42ac13e2af6f085d899380aee7714ae28c2 (patch) | |
| tree | 07ba3bb859f9696475e85dbc27af49fcd2b7d741 /src | |
| parent | b3120cb90e3d1dd5f4eef13e93378ccb1d01d098 (diff) | |
Update searchbox on URL changes (Fix D24369)
Summary:
In D24369 I introduced a regression: Where now the searchbox is updated on url changes for search urls, it is not updated anymore for regular folders. The effect is that not-indexed folders can have the extra options enabled or vice-versa. This patch fixes it, moving back the updating logic to `setSearchModeEnable`.
Test Plan: - Searchbox updates properly when changing between search urls and regular folders, either indexed or nor-indexed.
Reviewers: #dolphin, elvisangelaccio
Subscribers: kfm-devel, elvisangelaccio
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D24376
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 8e821d8aa..c6d9d89ad 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -385,6 +385,11 @@ bool DolphinViewContainer::isFilterBarVisible() const void DolphinViewContainer::setSearchModeEnabled(bool enabled) { + if (enabled) { + const QUrl& locationUrl = m_urlNavigator->locationUrl(); + m_searchBox->fromSearchUrl(locationUrl); + } + if (enabled == isSearchModeEnabled()) { if (enabled && !m_searchBox->hasFocus()) { m_searchBox->setFocus(); @@ -671,15 +676,11 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url) slotReturnPressed(); if (KProtocolManager::supportsListing(url)) { - const bool searchUrl = isSearchUrl(url); - if (searchUrl) { - m_searchBox->fromSearchUrl(url); - } - setSearchModeEnabled(searchUrl); + setSearchModeEnabled(isSearchUrl(url)); m_view->setUrl(url); tryRestoreViewState(); - if (m_autoGrabFocus && isActive() && !searchUrl) { + if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) { // When an URL has been entered, the view should get the focus. // The focus must be requested asynchronously, as changing the URL might create // a new view widget. |