diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 11:00:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 12:10:33 +0000 |
commit | 4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (patch) | |
tree | 19930057569fa270a8c8633172f5ff321543ecfc /src/quick/items/qquickitem.cpp | |
parent | 5de27a90e5771535365bc2d1b5c1241368877bf8 (diff) |
QQuickItem: correct focus reason for key navigation
Before we used Qt::OtherFocusReason for normal key navigation, such
as up/down/left/right. But in style world, the reason is critical
for focus change.
Now we follow the way in widgets world, use Qt::TabFocusReason and
Qt::BacktabFocusReason for down/up and right/left(or reversed if
mirrored).
Task-number: QTBUG-41801
Change-Id: I99e97ea4ced2cef9b3280c578c3a463de8fe1727
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index ce56bd661d..e030144676 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -622,7 +622,7 @@ void QQuickKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post) mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror; QQuickItem* leftItem = mirror ? d->right : d->left; if (leftItem) { - setFocusNavigation(leftItem, mirror ? "right" : "left"); + setFocusNavigation(leftItem, mirror ? "right" : "left", mirror ? Qt::TabFocusReason : Qt::BacktabFocusReason); event->accept(); } break; @@ -632,20 +632,20 @@ void QQuickKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post) mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror; QQuickItem* rightItem = mirror ? d->left : d->right; if (rightItem) { - setFocusNavigation(rightItem, mirror ? "left" : "right"); + setFocusNavigation(rightItem, mirror ? "left" : "right", mirror ? Qt::BacktabFocusReason : Qt::TabFocusReason); event->accept(); } break; } case Qt::Key_Up: if (d->up) { - setFocusNavigation(d->up, "up"); + setFocusNavigation(d->up, "up", Qt::BacktabFocusReason); event->accept(); } break; case Qt::Key_Down: if (d->down) { - setFocusNavigation(d->down, "down"); + setFocusNavigation(d->down, "down", Qt::TabFocusReason); event->accept(); } break; |