diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-11-26 19:42:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 17:17:27 +0100 |
| commit | 7529d38d836d0d781c2a813d0a973b3ee152611d (patch) | |
| tree | b324221125249e870ff3b1d0e8106d5604d08e1f /src | |
| parent | 6ebaad14ccd266326186ab338e0153eef580c755 (diff) | |
QComboBox: Don't do anything if wheel event delta is zero
This is a consequence of us wanting to show the OS X transient scrollbars
as soon as the user touches the trackpad with two fingers.
Task-number: QTBUG-35120
Change-Id: Icf63b0ec8c32ac66108822804bb06a0762547ef1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 37a14d3eb3..2c09f5a8f1 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3073,7 +3073,7 @@ void QComboBox::wheelEvent(QWheelEvent *e) newIndex--; while ((newIndex >= 0) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled)) newIndex--; - } else { + } else if (e->delta() < 0) { newIndex++; while ((newIndex < count()) && !(d->model->flags(d->model->index(newIndex,d->modelColumn,d->root)) & Qt::ItemIsEnabled)) newIndex++; |