1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QComboBox: emit currentIndexChanged() and currentTextChanged() when the model is cleared

Browse Source 
QComboBox uses QPersistentModelIndex to store the current index of the
underlying model. When the model is cleared, that index is automatically
invalidated, so calling QComboBoxPrivate::setCurrentIndex(QModelIndex())
does not result in signals being emitted, because we do not detect the
index change.

This patch uses indexBeforeChange to detect such situation and emit all
necessary signals.

Fixes: QTBUG-103007
Pick-to: 6.4 6.3 6.2
Change-Id: I29326830a30a17900839e8d1737a08bd940081ea
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ivan Solovev 2022-06-15 13:10:10 +02:00
parent e4961afed2
commit 662184ac68
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qcombobox.cpp
View File

@ -2135,7 +2135,11 @@ void QComboBoxPrivate::setCurrentIndex(const QModelIndex &mi)
}
updateLineEditGeometry();
}
if (indexChanged) {
// If the model was reset to an empty, currentIndex will be invalidated
// (because it's a QPersistentModelIndex), but the index change will never
// be advertised. So we need an explicit check for such condition.
const bool modelResetToEmpty = !normalized.isValid() && indexBeforeChange != -1;
if (indexChanged || modelResetToEmpty) {
q->update();
_q_emitCurrentIndexChanged(currentIndex);
}

33
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -146,6 +146,7 @@ private slots:
void checkEmbeddedLineEditWhenStyleSheetIsSet();
void propagateStyleChanges();
void buttonPressKeys();
void clearModel();
private:
PlatformInputContext m_platformInputContext;
@ -3593,5 +3594,37 @@ void tst_QComboBox::buttonPressKeys()
}
}
void tst_QComboBox::clearModel()
{
using namespace Qt::StringLiterals;
QStringListModel model({ "one"_L1, "two"_L1, "three"_L1 });
QComboBox combo;
combo.setModel(&model);
combo.setCurrentIndex(1);
QCOMPARE(combo.currentIndex(), 1);
QCOMPARE(combo.currentText(), model.index(1).data().toString());
QSignalSpy indexSpy(&combo, &QComboBox::currentIndexChanged);
QSignalSpy textSpy(&combo, &QComboBox::currentTextChanged);
QVERIFY(indexSpy.isEmpty());
QVERIFY(textSpy.isEmpty());
model.setStringList({});
QCOMPARE(indexSpy.count(), 1);
const int index = indexSpy.takeFirst().at(0).toInt();
QCOMPARE(index, -1);
QCOMPARE(textSpy.count(), 1);
const QString text = textSpy.takeFirst().at(0).toString();
QCOMPARE(text, QString());
QCOMPARE(combo.currentIndex(), -1);
QCOMPARE(combo.currentText(), QString());
}
QTEST_MAIN(tst_QComboBox)
#include "tst_qcombobox.moc"