kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.08'

Browse source
This commit is contained in:
Elvis Angelaccio 2019-10-02 23:03:27 +02:00
parent 557fcfa937 b3120cb90e
commit 43ea7052e1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dolphinviewcontainer.cpp
View file

@ -396,10 +396,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
m_searchBox->setVisible(enabled);
m_navigatorWidget->setVisible(!enabled);
if (enabled) {
const QUrl& locationUrl = m_urlNavigator->locationUrl();
m_searchBox->fromSearchUrl(locationUrl);
} else {
if (!enabled) {
m_view->setViewPropertiesContext(QString());
// Restore the URL for the URL navigator. If Dolphin has been
@ -676,11 +673,15 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
slotReturnPressed();
if (KProtocolManager::supportsListing(url)) {
setSearchModeEnabled(isSearchUrl(url));
const bool searchUrl = isSearchUrl(url);
if (searchUrl) {
m_searchBox->fromSearchUrl(url);
}
setSearchModeEnabled(searchUrl);
m_view->setUrl(url);
tryRestoreViewState();
if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) {
if (m_autoGrabFocus && isActive() && !searchUrl) {
// 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.