From 3619e74eb17f8ed2e76dadbef9c052304decd18b Mon Sep 17 00:00:00 2001 From: Jin Liu Date: Fri, 12 Jan 2024 12:56:43 +0800 Subject: Fix: closing split view doesn't update tab name BUG: 469316 --- src/dolphintabwidget.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/dolphintabwidget.cpp') diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 11a720d20..35921647e 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -104,11 +104,17 @@ void DolphinTabWidget::refreshViews() const int tabCount = count(); for (int i = 0; i < tabCount; ++i) { - tabBar()->setTabText(i, tabName(tabPageAt(i))); + updateTabName(i); tabPageAt(i)->refreshViews(); } } +void DolphinTabWidget::updateTabName(int index) +{ + Q_ASSERT(index >= 0); + tabBar()->setTabText(index, tabName(tabPageAt(index))); +} + bool DolphinTabWidget::isUrlOpen(const QUrl &url) const { return viewOpenAtDirectory(url).has_value(); @@ -163,9 +169,7 @@ void DolphinTabWidget::openNewTab(const QUrl &primaryUrl, const QUrl &secondaryU connect(tabPage, &DolphinTabPage::activeViewChanged, this, &DolphinTabWidget::activeViewChanged); connect(tabPage, &DolphinTabPage::activeViewUrlChanged, this, &DolphinTabWidget::tabUrlChanged); connect(tabPage->activeViewContainer(), &DolphinViewContainer::captionChanged, this, [this, tabPage]() { - const int tabIndex = indexOf(tabPage); - Q_ASSERT(tabIndex >= 0); - tabBar()->setTabText(tabIndex, tabName(tabPage)); + updateTabName(indexOf(tabPage)); }); if (position == NewTabPosition::FollowSetting) { @@ -407,7 +411,7 @@ void DolphinTabWidget::tabUrlChanged(const QUrl &url) { const int index = indexOf(qobject_cast(sender())); if (index >= 0) { - tabBar()->setTabText(index, tabName(tabPageAt(index))); + updateTabName(index); tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile)); if (tabBar()->isVisible()) { // ensure the path url ends with a slash to have proper folder icon for remote folders -- cgit v1.3