Allow folder creation on desktop via F10 shortcut

[dolphin.git] / src / dolphintabpage.cpp

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index d196508a8756e71a9e44054f22a59bb1dd9d6e92..7f945dce27772a0476ebaa49a8ea052e0cc222ac 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -159,11 +159,9 @@ void DolphinTabPage::connectNavigators(DolphinNavigatorsWidgetAction *navigators
 {
     m_navigatorsWidget = navigatorsWidget;
     auto primaryNavigator = navigatorsWidget->primaryUrlNavigator();
 {
     m_navigatorsWidget = navigatorsWidget;
     auto primaryNavigator = navigatorsWidget->primaryUrlNavigator();

-    primaryNavigator->setActive(m_primaryViewActive);

     m_primaryViewContainer->connectUrlNavigator(primaryNavigator);
     if (m_splitViewEnabled) {
         auto secondaryNavigator = navigatorsWidget->secondaryUrlNavigator();
     m_primaryViewContainer->connectUrlNavigator(primaryNavigator);
     if (m_splitViewEnabled) {
         auto secondaryNavigator = navigatorsWidget->secondaryUrlNavigator();

-        secondaryNavigator->setActive(!m_primaryViewActive);

         m_secondaryViewContainer->connectUrlNavigator(secondaryNavigator);
     }
     resizeNavigators();
         m_secondaryViewContainer->connectUrlNavigator(secondaryNavigator);
     }
     resizeNavigators();


@@ -178,12 +176,13 @@ void DolphinTabPage::disconnectNavigators()
     }
 }
 
     }
 }
 

-bool DolphinTabPage::eventFilter(QObject */* watched */, QEvent *event)
+bool DolphinTabPage::eventFilter(QObject *watched, QEvent *event)

 {
     if (event->type() == QEvent::Resize && m_navigatorsWidget) {
         resizeNavigators();
 {
     if (event->type() == QEvent::Resize && m_navigatorsWidget) {
         resizeNavigators();

+        return false;

     }
     }

-    return false;
+    return QWidget::eventFilter(watched, event);

 }
 
 void DolphinTabPage::resizeNavigators() const
 }
 
 void DolphinTabPage::resizeNavigators() const


@@ -292,11 +291,9 @@ void DolphinTabPage::restoreState(const QByteArray& state)
     stream >> m_primaryViewActive;
     if (m_primaryViewActive) {
         m_primaryViewContainer->setActive(true);
     stream >> m_primaryViewActive;
     if (m_primaryViewActive) {
         m_primaryViewContainer->setActive(true);

-        m_navigatorsWidget->primaryUrlNavigator()->setActive(true);

     } else {
         Q_ASSERT(m_splitViewEnabled);
         m_secondaryViewContainer->setActive(true);
     } else {
         Q_ASSERT(m_splitViewEnabled);
         m_secondaryViewContainer->setActive(true);

-        m_navigatorsWidget->primaryUrlNavigator()->setActive(false);

     }
 
     QByteArray splitterState;
     }
 
     QByteArray splitterState;