git.iko.soy/unity8
on xenial help sign in
Work around bug in Qt
0213407Daniel d'Andrada
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+16
compare with xenial
unifiedsplit
@@ -19,9 +19,15 @@
19
19
20#include "DirectionalDragArea.h"
20#include "DirectionalDragArea.h"
21
21
22+#include <QQuickWindow>
22#include <QtCore/qmath.h>
23#include <QtCore/qmath.h>
23#include <QDebug>
24#include <QDebug>
24
25
26+#pragma GCC diagnostic push
27+#pragma GCC diagnostic ignored "-pedantic"
28+#include <private/qquickwindow_p.h>
29+#pragma GCC diagnostic pop
30+
25// local
31// local
26#include "TouchOwnershipEvent.h"
32#include "TouchOwnershipEvent.h"
27#include "TouchRegistry.h"
33#include "TouchRegistry.h"
@@ -248,6 +254,16 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
248 QVector<int> ids;
254 QVector<int> ids;
249 ids.append(event->touchId());
255 ids.append(event->touchId());
250 grabTouchPoints(ids);
256 grabTouchPoints(ids);
257+
258+ // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
259+ // emulation it will cause the emulation logic to go nuts.
260+ // Thus we have to also grab the mouse in this case.
261+ if (window()) {
262+ QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
263+ if (windowPrivate->touchMouseId == event->touchId()) {
264+ grabMouse();
265+ }
266+ }
251 } else {
267 } else {
252 // We still wanna know when it ends for keeping the composition time window up-to-date
268 // We still wanna know when it ends for keeping the composition time window up-to-date
253 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
269 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
qml/Launcher/Launcher.qml+1−1
@@ -222,7 +222,7 @@ Item {
222
222
223 direction: Direction.Rightwards
223 direction: Direction.Rightwards
224
224
225− enabled: root.available
225+ enabled: root.available && root.state == ""
226 width: root.dragAreaWidth
226 width: root.dragAreaWidth
227 height: root.height
227 height: root.height
228
228
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+5
@@ -1,5 +1,10 @@
1include(QmlTest)
1include(QmlTest)
2
2
3+# DANGER! DANGER! Using Qt's private API!
4+include_directories(
5+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
6+)
7+
3include_directories(
8include_directories(
4 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
9 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
5 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
10 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+76
@@ -19,6 +19,7 @@
19#include <QtQuick/QQuickView>
19#include <QtQuick/QQuickView>
20#include <QtQml/QQmlEngine>
20#include <QtQml/QQmlEngine>
21#include <QPointer>
21#include <QPointer>
22+#include <private/qquickmousearea_p.h>
22
23
23// C++ std lib
24// C++ std lib
24#include <functional>
25#include <functional>
@@ -87,6 +88,30 @@ public:
87 qint64 m_msecsSinceReference;
88 qint64 m_msecsSinceReference;
88};
89};
89
90
91+/*
92+ QQuickMouseArea::canceled() signal is not registered in the meta object system.
93+ So using a QSignalSpy to track it won't work. Thus the only way to connect to it
94+ is using its method address directly.
95+ */
96+class MouseAreaSpy : public QObject
97+{
98+ Q_OBJECT
99+public:
100+ MouseAreaSpy(QQuickMouseArea *mouseArea)
101+ : canceledCount(0)
102+ {
103+ connect(mouseArea, &QQuickMouseArea::canceled,
104+ this, &MouseAreaSpy::onMouseAreaCanceled);
105+ }
106+
107+ int canceledCount;
108+
109+private Q_SLOTS:
110+ void onMouseAreaCanceled() {
111+ ++canceledCount;
112+ }
113+};
114+
90class tst_DirectionalDragArea: public GestureTest
115class tst_DirectionalDragArea: public GestureTest
91{
116{
92 Q_OBJECT
117 Q_OBJECT
@@ -120,6 +145,7 @@ private Q_SLOTS:
120 void withdrawTouchOwnershipCandidacyIfDisabledDuringRecognition_data();
145 void withdrawTouchOwnershipCandidacyIfDisabledDuringRecognition_data();
121 void tappedSignal();
146 void tappedSignal();
122 void tappedSignal_data();
147 void tappedSignal_data();
148+ void gettingTouchOwnershipMakesMouseAreaBehindGetCanceled();
123
149
124private:
150private:
125 void passTime(qint64 timeSpanMs);
151 void passTime(qint64 timeSpanMs);
@@ -1213,6 +1239,56 @@ void tst_DirectionalDragArea::tappedSignal_data()
1213 QTest::newRow("default gesture recognition") << false;
1239 QTest::newRow("default gesture recognition") << false;
1214}
1240}
1215
1241
1242+void tst_DirectionalDragArea::gettingTouchOwnershipMakesMouseAreaBehindGetCanceled()
1243+{
1244+ DirectionalDragArea *edgeDragArea =
1245+ m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
1246+ QVERIFY(edgeDragArea != nullptr);
1247+ edgeDragArea->setRecognitionTimer(fakeTimer);
1248+ edgeDragArea->setTimeSource(fakeTimeSource);
1249+
1250+ QQuickMouseArea *mouseArea =
1251+ m_view->rootObject()->findChild<QQuickMouseArea*>("mouseArea");
1252+ QVERIFY(mouseArea != nullptr);
1253+
1254+ MouseAreaSpy mouseAreaSpy(mouseArea);
1255+
1256+ QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea);
1257+ QPointF touchPoint = initialTouchPos;
1258+
1259+ qreal desiredDragDistance = edgeDragArea->distanceThreshold()*2;
1260+ QPointF dragDirectionVector(1.0f, 0.0f); // rightwards
1261+ qreal movementStepDistance = edgeDragArea->distanceThreshold() * 0.1f;
1262+ QPointF touchMovement = dragDirectionVector * movementStepDistance;
1263+ int totalMovementSteps = qCeil(desiredDragDistance / movementStepDistance);
1264+ int movementTimeStepMs = (edgeDragArea->compositionTime() * 1.5f) / totalMovementSteps;
1265+
1266+ QCOMPARE(mouseArea->pressed(), false);
1267+
1268+ QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());
1269+
1270+ // The TouchBegin passes through the DirectionalDragArea and reaches the MouseArea behind it,
1271+ // where it's converted to a MouseEvent by QQuickWindow and sent to the MouseArea which then
1272+ // accepts it. Making it get pressed.
1273+ QCOMPARE(mouseArea->pressed(), true);
1274+ QCOMPARE(mouseAreaSpy.canceledCount, 0);
1275+
1276+ for (int i = 0; i < totalMovementSteps; ++i) {
1277+ touchPoint += touchMovement;
1278+ passTime(movementTimeStepMs);
1279+ QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());
1280+ }
1281+
1282+ // As the DirectionalDragArea recognizes the gesture, it grabs the touch from the MouseArea,
1283+ // which should make the MouseArea get a cancelation event, which will then cause it to
1284+ // reset its state (going back to "unpressed"/"released").
1285+ QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
1286+ QCOMPARE(mouseArea->pressed(), false);
1287+ QCOMPARE(mouseAreaSpy.canceledCount, 1);
1288+
1289+ QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());
1290+}
1291+
1216////////////////////////// TouchMemento /////////////////////////////
1292////////////////////////// TouchMemento /////////////////////////////
1217
1293
1218TouchMemento::TouchMemento(const QTouchEvent *touchEvent)
1294TouchMemento::TouchMemento(const QTouchEvent *touchEvent)
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml+1
@@ -24,6 +24,7 @@ Rectangle {
24
24
25 MouseArea {
25 MouseArea {
26 id: mouseArea
26 id: mouseArea
27+ objectName: "mouseArea"
27 anchors.fill: parent
28 anchors.fill: parent
28 onClicked: {
29 onClicked: {
29 hpLauncher.reset()
30 hpLauncher.reset()