diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-17 03:49:53 (GMT) |
| commit | 815a5f08161f7add4a8b9d71f95bed0f45fbbe41 (patch) | |
| tree | 33d2e68038826ea0f5fec402303a585403b0be21 /src/declarative/fx/qfxgridview.cpp | |
| parent | 5872a38a2f2ccc67b590d580a258e110ee2d80dc (diff) | |
| parent | 467face42d2db216860dade5f5d817a8cddb86f3 (diff) | |
| download | Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.zip Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.gz Qt-815a5f08161f7add4a8b9d71f95bed0f45fbbe41.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxgridview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxgridview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 448a41a..6c5a712 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -1095,8 +1095,8 @@ void QFxGridView::keyPressEvent(QKeyEvent *event) int index = currentIndex() - d->columns; setCurrentIndex(index >= 0 ? index : d->model->count()-1); event->accept(); + return; } - return; } else if ((d->flow == QFxGridView::LeftToRight && event->key() == Qt::Key_Down) || (d->flow == QFxGridView::TopToBottom && event->key() == Qt::Key_Right)) { if (currentIndex() < d->model->count() - d->columns || d->wrap) { @@ -1104,8 +1104,8 @@ void QFxGridView::keyPressEvent(QKeyEvent *event) int index = currentIndex()+d->columns; setCurrentIndex(index < d->model->count() ? index : 0); event->accept(); + return; } - return; } else if ((d->flow == QFxGridView::LeftToRight && event->key() == Qt::Key_Left) || (d->flow == QFxGridView::TopToBottom && event->key() == Qt::Key_Up)) { if (currentIndex() > 0 || d->wrap) { @@ -1113,8 +1113,8 @@ void QFxGridView::keyPressEvent(QKeyEvent *event) int index = currentIndex() - 1; setCurrentIndex(index >= 0 ? index : d->model->count()-1); event->accept(); + return; } - return; } else if ((d->flow == QFxGridView::LeftToRight && event->key() == Qt::Key_Right) || (d->flow == QFxGridView::TopToBottom && event->key() == Qt::Key_Down)) { if (currentIndex() < d->model->count() - 1 || d->wrap) { @@ -1122,13 +1122,13 @@ void QFxGridView::keyPressEvent(QKeyEvent *event) int index = currentIndex() + 1; setCurrentIndex(index < d->model->count() ? index : 0); event->accept(); + return; } - return; } } d->moveReason = QFxGridViewPrivate::Other; - if (!event->isAccepted()) - QFxFlickable::keyPressEvent(event); + event->ignore(); + QFxFlickable::keyPressEvent(event); } /*! |