04d37a5 · unity8 · git.iko.soy

qml/Components/VirtualTouchPad.qml+1

compare with xenial

unifiedsplit

@@ -29,6 +29,7 @@ Item {

29 objectName: "touchPadArea"

30 anchors.fill: parent

31

32+ // FIXME: Once we have Qt DPR support, this should be Qt.styleHints.startDragDistance

32 property int clickThreshold: units.gu(1.5)

33 property int clickThreshold: units.gu(1.5)

33 property bool isClick: false

34 property bool isClick: false

34 property bool pressed: false

35 property bool pressed: false

tests/mocks/UInput/mockuinput.h+1−1

@@ -36,7 +36,7 @@ public:

36 ButtonMiddle

37 };

38

39− explicit MockUInput(QObject *parent = 0);

39+ explicit MockUInput(QObject *parent = nullptr);

40 ~MockUInput();

41

42 Q_INVOKABLE void createMouse();

tests/qmltests/Components/tst_VirtualTouchPad.qml+29

@@ -108,5 +108,34 @@ Item {

108 tryCompare(mouseEventSpy2, "count", 0)

109 mouseRelease(touchPadArea)

110 }

111+

112+ function test_twoFingerScroll() {

113+ var touchPadArea = findChild(touchScreenPad, "touchPadArea");

114+

115+ mouseEventSpy1.signalName = "mouseScrolled"

116+

117+ var startX = touchPadArea.width / 2;

118+ var startY = touchPadArea.height / 2;

119+

120+ var startX1 = startX - units.gu(1);

121+ var startX2 = startX + units.gu(1);

122+

123+ var event = touchEvent(touchPadArea)

124+ event.press(0, startX1, startY)

125+ event.press(1, startX2, startY);

126+ event.commit()

127+

128+ for (var i = 0; i < 10; i++) {

129+ event.move(0, startX1, startY + units.gu(i))

130+ event.move(1, startX2, startY + units.gu(i));

131+ event.commit();

132+

133+ tryCompare(mouseEventSpy1, "count", i + 1);

134+ }

135+

136+ event.release(0, startX1, startY + units.gu(11))

137+ event.release(1, startX2, startY + units.gu(11));

138+ event.commit();

139+ }

111 }

140 }

112}

141}