From 504db3f702625c63cb304430e60ab21b9411cb96 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 5 Jan 2019 17:29:34 +0100 Subject: [PATCH] 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 --- src/dolphintabpage.cpp | 2 +- src/tests/dolphinmainwindowtest.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index b2bb5c896..91fc7cfd8 100644 --- 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 d7ff1fb54..9cc6b84e8 100644 --- 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); } -- 2.47.3