summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2009-11-30 16:14:30 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2009-12-01 09:31:52 (GMT)
commit3c1c84dd569c02bfeec66aa985616b654b69a531 (patch)
tree583bbaef71f0d16754cb9350c05d5b227ed684c4
parent6ed35d7057080d85b4a456b7b9d1c9e3e111f0c5 (diff)
downloadQt-3c1c84dd569c02bfeec66aa985616b654b69a531.zip
Qt-3c1c84dd569c02bfeec66aa985616b654b69a531.tar.gz
Qt-3c1c84dd569c02bfeec66aa985616b654b69a531.tar.bz2
In QListViews, items were being hovered even when mouse was on the scrollbars
Reviewed-by: Olivier Task-number: QTBUG-6284
-rw-r--r--src/gui/itemviews/qabstractitemview.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index ad15655..acfeff8 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -2552,7 +2552,9 @@ void QAbstractItemView::verticalScrollbarValueChanged(int value)
Q_D(QAbstractItemView);
if (verticalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
d->model->fetchMore(d->root);
- d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
+ QPoint posInVp = viewport()->mapFromGlobal(QCursor::pos());
+ if (viewport()->rect().contains(posInVp))
+ d->checkMouseMove(posInVp);
}
/*!
@@ -2563,7 +2565,9 @@ void QAbstractItemView::horizontalScrollbarValueChanged(int value)
Q_D(QAbstractItemView);
if (horizontalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
d->model->fetchMore(d->root);
- d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
+ QPoint posInVp = viewport()->mapFromGlobal(QCursor::pos());
+ if (viewport()->rect().contains(posInVp))
+ d->checkMouseMove(posInVp);
}
/*!