qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickTableView: respect activeFocusOnTab 

QQuickItem has a activeFocusOnTab property
which should also be respected by TableView.
When disabled, TableView should not transfer
focus between the cells when the user
hits the tab key.

Change-Id: I234286926b58753fa50923321302d4fa108a4515
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2022-11-18 22:39:31 +01:00
parent ac4fea7537
commit 2becb1c207
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/quick/items/qquicktableview.cpp
View File

@ -4306,6 +4306,7 @@ void QQuickTableViewPrivate::init()
Q_Q(QQuickTableView);
q->setFlag(QQuickItem::ItemIsFocusScope);
q->setActiveFocusOnTab(true);
positionXAnimation.setTargetObject(q);
positionXAnimation.setProperty(QStringLiteral("contentX"));
@ -4430,6 +4431,14 @@ bool QQuickTableViewPrivate::setCurrentIndexFromKeyEvent(QKeyEvent *e)
const QPoint currentCell = q->cellAtIndex(currentIndex);
const bool select = (e->modifiers() & Qt::ShiftModifier) && (e->key() != Qt::Key_Backtab);
if (!q->activeFocusOnTab()) {
switch (e->key()) {
case Qt::Key_Tab:
case Qt::Key_Backtab:
return false;
}
}
if (!cellIsValid(currentCell)) {
switch (e->key()) {
case Qt::Key_Up:

46
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
View File

@ -210,6 +210,7 @@ private slots:
void moveCurrentIndexUsingPageUpDownKeys();
void moveCurrentIndexUsingTabKey_data();
void moveCurrentIndexUsingTabKey();
void respectActiveFocusOnTabDisabled();
void setCurrentIndexOnFirstKeyPress_data();
void setCurrentIndexOnFirstKeyPress();
void setCurrentIndexFromMouse();
@ -4957,6 +4958,8 @@ void tst_QQuickTableView::moveCurrentIndexUsingTabKey()
WAIT_UNTIL_POLISHED;
QVERIFY(tableView->activeFocusOnTab());
QCOMPARE(tableView->currentColumn(), -1);
QCOMPARE(tableView->currentRow(), -1);
@ -5017,6 +5020,49 @@ void tst_QQuickTableView::moveCurrentIndexUsingTabKey()
QVERIFY(!selectionModel.hasSelection());
}
void tst_QQuickTableView::respectActiveFocusOnTabDisabled()
{
// Ensure that we don't move focus for tab or backtab
// when TableView.setActiveFocusOnTab is false.
LOAD_TABLEVIEW("tableviewwithselected1.qml");
TestModel model(3, 3);
QItemSelectionModel selectionModel(&model);
tableView->setModel(QVariant::fromValue(&model));
tableView->setSelectionModel(&selectionModel);
tableView->setActiveFocusOnTab(false);
tableView->setFocus(true);
QQuickWindow *window = tableView->window();
const char kCurrent[] = "current";
WAIT_UNTIL_POLISHED;
QCOMPARE(tableView->currentColumn(), -1);
QCOMPARE(tableView->currentRow(), -1);
QVERIFY(!tableView->activeFocusOnTab());
// Start by making cell 0, 0 current
const QPoint cell0_0(0, 0);
selectionModel.setCurrentIndex(tableView->modelIndex(cell0_0), QItemSelectionModel::NoUpdate);
QVERIFY(tableView->itemAtCell(cell0_0)->property(kCurrent).toBool());
QCOMPARE(tableView->currentColumn(), cell0_0.x());
QCOMPARE(tableView->currentRow(), cell0_0.y());
// Press Tab
const QPoint cell1_0(1, 0);
QTest::keyPress(window, Qt::Key_Tab);
QCOMPARE(selectionModel.currentIndex(), tableView->modelIndex(cell0_0));
QVERIFY(tableView->itemAtCell(cell0_0)->property(kCurrent).toBool());
QVERIFY(!tableView->itemAtCell(cell1_0)->property(kCurrent).toBool());
// Press Backtab
QTest::keyPress(window, Qt::Key_Backtab);
QCOMPARE(selectionModel.currentIndex(), tableView->modelIndex(cell0_0));
QVERIFY(tableView->itemAtCell(cell0_0)->property(kCurrent).toBool());
}
void tst_QQuickTableView::setCurrentIndexOnFirstKeyPress_data()
{
QTest::addColumn<Qt::Key>("arrowKey");