]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Update window title after closing split view
authorRobert Jennings <rjennings.kde@gmail.com>
Wed, 25 Apr 2018 10:35:29 +0000 (12:35 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Wed, 25 Apr 2018 10:37:28 +0000 (12:37 +0200)
Summary:

In dolphintabpage.cpp:

Through the connections set up in createViewContainer(), m_primaryViewContainer->setActive(true), at line 98,
ends up triggering slotViewActivated().

Because m_primaryViewActive is true, oldActiveView is not set to the view needed in this particular situation.
Both oldActiveView and newActiveView end up pointing to the same view and the connections are not set up.

BUG: 385111
FIXED-IN: 18.04.1

Test Plan:
1. Open split view
2. Make left panel active
3. Close split view
4. Navigate to various directories

Window title now updates to show current directory

Also tried with multiple tabs/combinations

Reviewers: #dolphin, ngraham

Reviewed By: #dolphin, ngraham

Subscribers: elvisangelaccio, ngraham

Differential Revision: https://phabricator.kde.org/D12446

src/dolphintabpage.cpp

index 342d6f6deeca850414bda003d09509fb33c31ffc..a96c8b6a32dc6706c6aae1abb90dd465ea2703fb 100644 (file)
@@ -94,6 +94,7 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl)
                 // If the primary view is active, we have to swap the pointers
                 // because the secondary view will be the new primary view.
                 qSwap(m_primaryViewContainer, m_secondaryViewContainer);
+                m_primaryViewActive = false;
             }
             m_primaryViewContainer->setActive(true);
             view->close();