diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-07-10 16:40:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 17:37:55 +0200 |
| commit | dd0caf5ad611311621696177adcaf87c33f88a03 (patch) | |
| tree | ebc46c8e894a68a6a1fb9e9a6a9ba9da81e48f3e /src/quick/items/qquickmousearea_p_p.h | |
| parent | b5eb3d69b40c4b750a1bbece7be2acbe7cf918e3 (diff) | |
pressed and pressedButtons don't work when multiple buttons are pressed
The pressed property would react to any mouse event, regardless of
whether it was in acceptedButtons, or there were other buttons still
pressed. It will now remain true while any button in acceptedButtons
is pressed.
The pressedButtons property could contain buttons not in the
acceptedButtons mask. It will now only contain buttons that are in the
acceptedButtons mask.
Task-number: QTBUG-26458
Change-Id: I6b25cc36a58c113de062d530761dc179d7ef4a5a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickmousearea_p_p.h')
| -rw-r--r-- | src/quick/items/qquickmousearea_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h index 39a06161b7..aa28da88bc 100644 --- a/src/quick/items/qquickmousearea_p_p.h +++ b/src/quick/items/qquickmousearea_p_p.h @@ -87,7 +87,6 @@ public: bool enabled : 1; bool hovered : 1; - bool pressed : 1; bool longPress : 1; bool moved : 1; bool dragX : 1; @@ -96,6 +95,7 @@ public: bool doubleClick : 1; bool preventStealing : 1; bool propagateComposedEvents : 1; + Qt::MouseButtons pressed; #ifndef QT_NO_DRAGANDDROP QQuickDrag *drag; #endif |