Merge branch 'Applications/19.08'

This commit is contained in:
Elvis Angelaccio 2019-10-06 11:51:34 +02:00
commit fcf2d98447

View file

@ -385,6 +385,9 @@ bool DolphinViewContainer::isFilterBarVisible() const
void DolphinViewContainer::setSearchModeEnabled(bool enabled) void DolphinViewContainer::setSearchModeEnabled(bool enabled)
{ {
m_searchBox->setVisible(enabled);
m_navigatorWidget->setVisible(!enabled);
if (enabled) { if (enabled) {
const QUrl& locationUrl = m_urlNavigator->locationUrl(); const QUrl& locationUrl = m_urlNavigator->locationUrl();
m_searchBox->fromSearchUrl(locationUrl); m_searchBox->fromSearchUrl(locationUrl);
@ -398,9 +401,6 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
return; return;
} }
m_searchBox->setVisible(enabled);
m_navigatorWidget->setVisible(!enabled);
if (!enabled) { if (!enabled) {
m_view->setViewPropertiesContext(QString()); m_view->setViewPropertiesContext(QString());