X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/084cf94a31e7bccbcc9c25d31e6e9893db38d696..7a28bed8ee3c6400abc2cfe8bd1ce67454f4d00a:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ccd80151b..f90ff0c73 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1845,7 +1845,6 @@ void DolphinMainWindow::setupActions()
     // only set it for the menu version
     actionCollection()->setDefaultShortcut(m_splitViewMenuAction, Qt::Key_F3);
 
-    m_splitViewAction->setPopupMode(QToolButton::MenuButtonPopup);
     connect(m_splitViewAction, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
     connect(m_splitViewMenuAction, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
 
@@ -2536,6 +2535,14 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer *container)
 void DolphinMainWindow::updateSplitActions()
 {
     QAction *popoutSplitAction = actionCollection()->action(QStringLiteral("popout_split_view"));
+
+    auto setActionPopupMode = [this](KActionMenu *action, QToolButton::ToolButtonPopupMode popupMode) {
+        action->setPopupMode(popupMode);
+        if (auto *buttonForAction = qobject_cast<QToolButton *>(toolBar()->widgetForAction(action))) {
+            buttonForAction->setPopupMode(popupMode);
+        }
+    };
+
     const DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (GeneralSettings::closeActiveSplitView() ? tabPage->primaryViewActive() : !tabPage->primaryViewActive()) {
@@ -2553,6 +2560,7 @@ void DolphinMainWindow::updateSplitActions()
         }
         popoutSplitAction->setEnabled(true);
         if (!m_splitViewAction->menu()) {
+            setActionPopupMode(m_splitViewAction, QToolButton::MenuButtonPopup);
             m_splitViewAction->setMenu(new QMenu);
             m_splitViewAction->addAction(popoutSplitAction);
         }
@@ -2564,7 +2572,9 @@ void DolphinMainWindow::updateSplitActions()
         popoutSplitAction->setEnabled(false);
         if (m_splitViewAction->menu()) {
             m_splitViewAction->removeAction(popoutSplitAction);
+            m_splitViewAction->menu()->deleteLater();
             m_splitViewAction->setMenu(nullptr);
+            setActionPopupMode(m_splitViewAction, QToolButton::DelayedPopup);
         }
     }