mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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
This commit is contained in:
parent
1cde03cdfe
commit
504db3f702
|
@ -331,8 +331,8 @@ void DolphinTabPage::slotViewActivated()
|
||||||
this, &DolphinTabPage::slotViewUrlRedirection);
|
this, &DolphinTabPage::slotViewUrlRedirection);
|
||||||
}
|
}
|
||||||
|
|
||||||
emit activeViewUrlChanged(activeViewContainer()->url());
|
|
||||||
emit activeViewChanged(activeViewContainer());
|
emit activeViewChanged(activeViewContainer());
|
||||||
|
emit activeViewUrlChanged(activeViewContainer()->url());
|
||||||
}
|
}
|
||||||
|
|
||||||
void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl)
|
void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl)
|
||||||
|
|
|
@ -203,7 +203,6 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterChangingSplitView()
|
||||||
|
|
||||||
// Activate back the left view and check whether the old title gets restored.
|
// Activate back the left view and check whether the old title gets restored.
|
||||||
leftViewContainer->setActive(true);
|
leftViewContainer->setActive(true);
|
||||||
QEXPECT_FAIL("", "Bug #402641", Continue);
|
|
||||||
QCOMPARE(m_mainWindow->windowTitle(), oldTitle);
|
QCOMPARE(m_mainWindow->windowTitle(), oldTitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue