@@ -33,7 +33,8 @@ Item {
3333 // FIXME: Once we have Qt DPR support, this should be Qt.styleHints.startDragDistance
3434 readonly property int clickThreshold: units.gu(1.5)
3535 property bool isClick: false
36− property bool pressed: false
36+ property bool isDoubleClick: false
37+ property bool isDrag: false
3738
3839 onPressed: {
3940 // If double-tapping *really* fast, it could happen that we end up having only point2 pressed
@@ -42,7 +43,7 @@ Item {
4243 && clickTimer.running) {
4344 clickTimer.stop();
4445 uinput.pressMouse(UInput.ButtonLeft)
45− pressed = true;
46+ isDoubleClick = true;
4647 }
4748 isClick = true;
4849 }
@@ -59,14 +60,15 @@ Item {
5960 }
6061
6162 onReleased: {
63+ if (isDoubleClick || isDrag) {
64+ uinput.releaseMouse(UInput.ButtonLeft)
65+ isDoubleClick = false;
66+ }
6267 if (isClick) {
63− if (pressed) {
64− uinput.releaseMouse(UInput.ButtonLeft)
65− pressed = false;
66− }
6768 clickTimer.scheduleClick(point1.pressed ? UInput.ButtonRight : UInput.ButtonLeft)
6869 }
6970 isClick = false;
71+ isDrag = false;
7072 }
7173
7274 Timer {
@@ -90,6 +92,7 @@ Item {
9092 (Math.abs(tp.x - tp.startX) > clickThreshold ||
9193 Math.abs(tp.y - tp.startY) > clickThreshold)) {
9294 isClick = false;
95+ isDrag = true;
9396 }
9497
9598 uinput.moveMouse(tp.x - tp.previousX, tp.y - tp.previousY);