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

Item views: respect selection mode when closing an editor

Browse Source 
Task-number: QTBUG-31411
Change-Id: I1a52eb739e0bc2afa7227f006461916df8ecaf48
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
This commit is contained in:
J-P Nurmi 2014-03-28 16:13:59 +01:00 committed by The Qt Project
parent cc08fc7bfd
commit 0cb2c760c2
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -2771,8 +2771,9 @@ void QAbstractItemView::closeEditor(QWidget *editor, QAbstractItemDelegate::EndE
}
// The EndEditHint part
QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::ClearAndSelect
| d->selectionBehaviorFlags();
QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::NoUpdate;
if (d->selectionMode != NoSelection)
flags = QItemSelectionModel::ClearAndSelect | d->selectionBehaviorFlags();
switch (hint) {
case QAbstractItemDelegate::EditNextItem: {
QModelIndex index = moveCursor(MoveNext, Qt::NoModifier);

42
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
View File

@ -247,6 +247,7 @@ private slots:
void testNoActivateOnDisabledItem();
void testFocusPolicy_data();
void testFocusPolicy();
void QTBUG31411_noSelection();
};
class MyAbstractItemDelegate : public QAbstractItemDelegate
@ -1782,5 +1783,46 @@ void tst_QAbstractItemView::testFocusPolicy()
QVERIFY(!qApp->focusWidget());
}
Q_DECLARE_METATYPE(QItemSelection)
void tst_QAbstractItemView::QTBUG31411_noSelection()
{
QWidget window;
QTableView *table = new QTableView(&window);
table->setSelectionMode(QAbstractItemView::NoSelection);
QVBoxLayout *layout = new QVBoxLayout(&window);
layout->addWidget(table);
QStandardItemModel model;
model.setRowCount(10);
model.setColumnCount(10);
table->setModel(&model);
table->setCurrentIndex(model.index(1, 1));
centerOnScreen(&window);
moveCursorAway(&window);
window.show();
QApplication::setActiveWindow(&window);
QVERIFY(QTest::qWaitForWindowActive(&window));
qRegisterMetaType<QItemSelection>();
QSignalSpy selectionChangeSpy(table->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)));
QVERIFY(selectionChangeSpy.isValid());
QPoint clickpos = table->visualRect(model.index(1, 1)).center();
QTest::mouseClick(table->viewport(), Qt::LeftButton, Qt::NoModifier, clickpos);
QTest::mouseDClick(table->viewport(), Qt::LeftButton, Qt::NoModifier, clickpos);
QPointer<QWidget> editor1 = qApp->focusWidget();
QVERIFY(editor1);
QTest::keyClick(editor1, Qt::Key_Tab, Qt::NoModifier);
QPointer<QWidget> editor2 = qApp->focusWidget();
QVERIFY(editor2);
QTest::keyClick(editor2, Qt::Key_Escape, Qt::NoModifier);
QCOMPARE(selectionChangeSpy.count(), 0);
}
QTEST_MAIN(tst_QAbstractItemView)
#include "tst_qabstractitemview.moc"