AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash when removing the last visible tab

Browse Source 
The code incorrectly tried to ensure that the firstVisible tab was a
valid index, even though there might not be any visible tab left after
removing the last visible tab.

The same logic didn't exist of the lastVisible tab, so we tripped the
assert in qBound, as max (being -1) ended up smaller than min (0).

Fix this by removing the wrong correcting of firstVisible to be always
valid. Make sure we emit currentChanged with -1 when no visible tab is
left after removing the current tab.

Add a test.

Fixes: QTBUG-104003
Pick-to: 6.3 6.2
Change-Id: I27e6438a02d0a0f1ac4d0e0160cee4f33b3f3766
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-06-10 22:44:19 +02:00
parent e7477e8934
commit ac80cee846
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/widgets/qtabbar.cpp
View File

@ -1052,8 +1052,6 @@ void QTabBar::removeTab(int index)
break;
case SelectLeftTab:
newIndex = qBound(d->firstVisible, index-1, d->lastVisible);
if (newIndex < 0)
newIndex = 0;
break;
default:
break;
@ -1064,6 +1062,9 @@ void QTabBar::removeTab(int index)
int bump = d->tabList.at(newIndex)->lastTab;
setCurrentIndex(newIndex);
d->tabList.at(newIndex)->lastTab = bump;
} else {
// we had a valid current index, but there are no visible tabs left
emit currentChanged(-1);
}
} else {
emit currentChanged(-1);
@ -1921,8 +1922,6 @@ void QTabBarPrivate::calculateFirstLastVisible(int index, bool visible, bool rem
break;
}
}
if (firstVisible < 0)
firstVisible = 0;
}
if (remove || (index == lastVisible)) {
lastVisible = -1;

34
tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
View File

@ -57,6 +57,7 @@ private slots:
void setUsesScrollButtons();
void removeLastTab();
void removeLastVisibleTab();
void closeButton();
@ -467,6 +468,39 @@ void tst_QTabBar::removeLastTab()
spy.clear();
}
void tst_QTabBar::removeLastVisibleTab()
{
QTabBar tabbar;
tabbar.setSelectionBehaviorOnRemove(QTabBar::SelectionBehavior::SelectRightTab);
int invisible = tabbar.addTab("invisible");
int visible = tabbar.addTab("visible");
tabbar.setCurrentIndex(visible);
tabbar.adjustSize();
tabbar.setTabVisible(invisible, false);
{
QSignalSpy spy(&tabbar, SIGNAL(currentChanged(int)));
tabbar.removeTab(visible);
QCOMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).at(0).toInt(), -1);
QCOMPARE(tabbar.currentIndex(), -1);
}
tabbar.setSelectionBehaviorOnRemove(QTabBar::SelectionBehavior::SelectLeftTab);
visible = tabbar.insertTab(0, "visible");
++invisible;
QVERIFY(!tabbar.isTabVisible(invisible));
tabbar.setCurrentIndex(visible);
{
QSignalSpy spy(&tabbar, SIGNAL(currentChanged(int)));
tabbar.removeTab(visible);
QCOMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).at(0).toInt(), -1);
QCOMPARE(tabbar.currentIndex(), -1);
}
}
void tst_QTabBar::closeButton()
{
QTabBar tabbar;