Merge branch 'release/20.12'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 9761f108fc84602ae83f51a3807151e215fbe333..0fe8ee9d3de0790ca3ebfb0e0c6ec65d2691b9b3 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -291,11 +291,11 @@ void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator
     Q_CHECK_PTR(m_view);
 
     urlNavigator->setLocationUrl(m_view->url());
     Q_CHECK_PTR(m_view);
 
     urlNavigator->setLocationUrl(m_view->url());

-    urlNavigator->setActive(isActive());

     if (m_urlNavigatorVisualState) {
         urlNavigator->setVisualState(*m_urlNavigatorVisualState.get());
         m_urlNavigatorVisualState.reset();
     }
     if (m_urlNavigatorVisualState) {
         urlNavigator->setVisualState(*m_urlNavigatorVisualState.get());
         m_urlNavigatorVisualState.reset();
     }

+    urlNavigator->setActive(isActive());

 
     connect(m_view, &DolphinView::urlChanged,
             urlNavigator, &DolphinUrlNavigator::setLocationUrl);
 
     connect(m_view, &DolphinView::urlChanged,
             urlNavigator, &DolphinUrlNavigator::setLocationUrl);


@@ -307,7 +307,8 @@ void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator
             this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
     connect(urlNavigator, &DolphinUrlNavigator::urlSelectionRequested,
             this, &DolphinViewContainer::slotUrlSelectionRequested);
             this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
     connect(urlNavigator, &DolphinUrlNavigator::urlSelectionRequested,
             this, &DolphinViewContainer::slotUrlSelectionRequested);

-    connect(urlNavigator, &DolphinUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) {
+    connect(urlNavigator, &DolphinUrlNavigator::urlsDropped,
+            this, [=](const QUrl &destination, QDropEvent *event) {

         m_view->dropUrls(destination, event, urlNavigator->dropWidget());
     });
 
         m_view->dropUrls(destination, event, urlNavigator->dropWidget());
     });