]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix DolphinMainWindow::viewContainers() to take into account split views
authorNate Graham <nate@kde.org>
Sat, 17 Oct 2020 00:35:54 +0000 (18:35 -0600)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Fri, 23 Oct 2020 17:00:09 +0000 (17:00 +0000)
The function was previously assuming that each tab view has exactly one
view container, which is not necessarily accurate; some could have a
split view open.

src/dolphinmainwindow.cpp

index 8bc890f04a592e50d894d3b040e30ae6860b9e7c..8d4f50270b5c086b1ef23236bb54eecc3b28a1b3 100644 (file)
@@ -204,9 +204,14 @@ DolphinMainWindow::~DolphinMainWindow()
 QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
 {
     QVector<DolphinViewContainer*> viewContainers;
-    viewContainers.reserve(m_tabWidget->count());
+
     for (int i = 0; i < m_tabWidget->count(); ++i) {
-        viewContainers << m_tabWidget->tabPageAt(i)->activeViewContainer();
+        DolphinTabPage *tabPage = m_tabWidget->tabPageAt(i);
+
+        viewContainers << tabPage->primaryViewContainer();
+        if (tabPage->splitViewEnabled()) {
+            viewContainers << tabPage->secondaryViewContainer();
+        }
     }
     return viewContainers;
 }