Fix title update when changing active split view

Summary:
The DolphinTabPage::activeViewUrlChanged signal triggers the title
update in DolphinMainWindow, which sets the new title from the
`m_activeViewContainer` instance.

This means we need to notify the main window that the active view
changed before telling it that the current url changed.

BUG: 402641
FIXED-IN: 18.12.1

Reviewers: #dolphin, rizzitello, ngraham

Reviewed By: #dolphin, rizzitello, ngraham

Subscribers: rizzitello, kfm-devel

Tags: #dolphin

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

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index b2bb5c896d95d720c4cab58a8f4d268c6c46214a..91fc7cfd8800f5582bc4a2910135fd47687b0e3a 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -331,8 +331,8 @@ void DolphinTabPage::slotViewActivated()
                 this, &DolphinTabPage::slotViewUrlRedirection);
     }
 
-    emit activeViewUrlChanged(activeViewContainer()->url());
     emit activeViewChanged(activeViewContainer());
+    emit activeViewUrlChanged(activeViewContainer()->url());
 }
 
 void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl)

diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp
index d7ff1fb542d836b34a5ab47e4340e17839489730..9cc6b84e8d52b46a1d506ce2c93c1784e7ae35c3 100644 (file)
--- a/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@ -203,7 +203,6 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterChangingSplitView()
 
     // Activate back the left view and check whether the old title gets restored.
     leftViewContainer->setActive(true);
-    QEXPECT_FAIL("", "Bug #402641", Continue);
     QCOMPARE(m_mainWindow->windowTitle(), oldTitle);
 }