diff options
| author | Rafael Fernández López <[email protected]> | 2007-10-05 02:01:16 +0000 |
|---|---|---|
| committer | Rafael Fernández López <[email protected]> | 2007-10-05 02:01:16 +0000 |
| commit | 47f0accc47fddf87c7e0265692ae2742ea4f4272 (patch) | |
| tree | 563607a09488d21e70b9fce0a857c803203f4624 | |
| parent | 3ac92d5c0dbc3ae49fc7919d4a64087cfd83469b (diff) | |
Nice catch on keyboard navigation when RightToLeft is set... :)
svn path=/trunk/KDE/kdebase/apps/; revision=721340
| -rw-r--r-- | src/kcategorizedview.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/kcategorizedview.cpp b/src/kcategorizedview.cpp index d5ad19301..ec5ba36b7 100644 --- a/src/kcategorizedview.cpp +++ b/src/kcategorizedview.cpp @@ -1022,7 +1022,7 @@ void KCategorizedView::dragLeaveEvent(QDragLeaveEvent *event) } QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction, - Qt::KeyboardModifiers modifiers) + Qt::KeyboardModifiers modifiers) { if ((viewMode() != KCategorizedView::IconMode) || !d->proxyModel || @@ -1133,6 +1133,16 @@ QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction, } case QAbstractItemView::MoveLeft: + if (layoutDirection() == Qt::RightToLeft) + { + d->forcedSelectionPosition = d->elementsInfo[current.row() + 1].relativeOffsetToCategory % elementsPerRow; + + if (d->forcedSelectionPosition < 0) + d->forcedSelectionPosition = (d->categoriesIndexes[theCategory].count() - 1) % elementsPerRow; + + return d->proxyModel->index(current.row() + 1, 0); + } + d->forcedSelectionPosition = d->elementsInfo[current.row() - 1].relativeOffsetToCategory % elementsPerRow; if (d->forcedSelectionPosition < 0) @@ -1141,6 +1151,16 @@ QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction, return d->proxyModel->index(current.row() - 1, 0); case QAbstractItemView::MoveRight: + if (layoutDirection() == Qt::RightToLeft) + { + d->forcedSelectionPosition = d->elementsInfo[current.row() - 1].relativeOffsetToCategory % elementsPerRow; + + if (d->forcedSelectionPosition < 0) + d->forcedSelectionPosition = (d->categoriesIndexes[theCategory].count() - 1) % elementsPerRow; + + return d->proxyModel->index(current.row() - 1, 0); + } + d->forcedSelectionPosition = d->elementsInfo[current.row() + 1].relativeOffsetToCategory % elementsPerRow; if (d->forcedSelectionPosition < 0) |