diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-02 14:59:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-08-02 13:23:00 +0000 |
| commit | c5e75a9f647139336e254fa788aa39e9772a34d6 (patch) | |
| tree | 5d99230a12cc74ba6602b413bdbfe07092ba9e51 /src/quick/items/qquickwindow.cpp | |
| parent | 0b73cc36f398aad9001439987c6c969afae6492e (diff) | |
Optimize QQuickWindowPrivate::deliverPressEvent slightly
Calling the merge function at least one time less often saves some
vector moving around.
Change-Id: I4573fa4cb34398fa6297786558a21b780429d121
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index ad174d66ff..560aab9e73 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2243,7 +2243,11 @@ bool QQuickWindowPrivate::deliverNewTouchPoints(QQuickPointerTouchEvent *event, QVector<QQuickItem *> targetItems; for (QPointF point: points) { QVector<QQuickItem *> targetItemsForPoint = pointerTargets(contentItem, point, false); - targetItems = mergePointerTargets(targetItems, targetItemsForPoint); + if (targetItems.count()) { + targetItems = mergePointerTargets(targetItems, targetItemsForPoint); + } else { + targetItems = targetItemsForPoint; + } } for (QQuickItem *item: targetItems) |