diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-15 11:57:09 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-15 12:14:30 +0200 |
| commit | e91b778395da7162a22be3a858ed592d7559c5df (patch) | |
| tree | ea8cc7bdbb74515bc9099cb5b75fabfee5a8d561 /src | |
| parent | e9bfd7862f858e8a4d10e9a9e14d4c1f6cc2aa9b (diff) | |
QMouseEvent: Set QEventPoint globalPressPosition and globalLastPosition
Qt Quick's MultiPointTouchArea compares the delta since press against
the drag threshold to determine whether a gesture has started, for
example. Since it can be configured to handle both mouse and touch,
this needs to be done for mouse events in a similar way as it's done
in QGuiApplicationPrivate::processTouchEvent().
Storing one global cursor position is not OK for multi-mouse support,
but that's a problem for another time; so we keep using
QGuiApplicationPrivate::lastCursorPosition for now.
Amends 4e400369c08db251cd489fec1229398c224d02b4
Change-Id: I242565c4548878878a67074877468e5fde84a490
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 2a4b286a05..a1d5a6e737 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -188,7 +188,7 @@ QPalette *QGuiApplicationPrivate::app_pal = nullptr; // default applicati ulong QGuiApplicationPrivate::mousePressTime = 0; Qt::MouseButton QGuiApplicationPrivate::mousePressButton = Qt::NoButton; -int QGuiApplicationPrivate::mousePressX = 0; +int QGuiApplicationPrivate::mousePressX = 0; // TODO use QPointF and store it in QPointingDevicePrivate int QGuiApplicationPrivate::mousePressY = 0; static int mouseDoubleClickDistance = -1; @@ -2155,6 +2155,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo modifier_buttons = e->modifiers; QPointF localPoint = e->localPos; QPointF globalPoint = e->globalPos; + const QPointF lastGlobalPosition = QGuiApplicationPrivate::lastCursorPosition; bool doubleClick = false; if (mouseMove) { @@ -2215,6 +2216,9 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo QMouseEvent ev(type, localPoint, localPoint, globalPoint, button, e->buttons, e->modifiers, e->source, device); ev.setTimestamp(e->timestamp); + QMutableEventPoint &mutPt = QMutableSinglePointEvent::from(ev).mutablePoint(); + mutPt.setGlobalLastPosition(lastGlobalPosition); + mutPt.setGlobalPressPosition(QPointF(mousePressX, mousePressY)); if (window->d_func()->blockedByModalWindow && !qApp->d_func()->popupActive()) { // a modal window is blocking this window, don't allow mouse events through |