git.iko.soy/unity8
on xenial help sign in
touchX -> touchPosition.x
ee64290Albert Astals Cid
qml/Launcher/Launcher.qml+3−3
compare with xenial
unifiedsplit
@@ -31,11 +31,11 @@ Item {
31 property int panelWidth: units.gu(8)
31 property int panelWidth: units.gu(8)
32 property int dragAreaWidth: units.gu(1)
32 property int dragAreaWidth: units.gu(1)
33 property int minimizeDistance: units.gu(26)
33 property int minimizeDistance: units.gu(26)
34− property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
34+ property real progress: dragArea.dragging && dragArea.touchPosition.x > panelWidth ?
35− (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
35+ (width * (dragArea.touchPosition.x-panelWidth) / (width - panelWidth)) : 0
36
36
37 readonly property bool dragging: dragArea.dragging
37 readonly property bool dragging: dragArea.dragging
38− readonly property real dragDistance: dragArea.dragging ? dragArea.touchX : 0
38+ readonly property real dragDistance: dragArea.dragging ? dragArea.touchPosition.x : 0
39 readonly property real visibleWidth: panel.width + panel.x
39 readonly property real visibleWidth: panel.width + panel.x
40
40
41 readonly property bool shown: panel.x > -panel.width
41 readonly property bool shown: panel.x > -panel.width
qml/Panel/IndicatorsMenu.qml+4−4
@@ -269,7 +269,7 @@ Showable {
269
269
270 property real rowMappedLateralPosition: {
270 property real rowMappedLateralPosition: {
271 if (!d.activeDragHandle) return -1;
271 if (!d.activeDragHandle) return -1;
272− return d.activeDragHandle.mapToItem(bar, d.activeDragHandle.touchX, 0).x;
272+ return d.activeDragHandle.mapToItem(bar, d.activeDragHandle.touchPosition.x, 0).x;
273 }
273 }
274
274
275 function updateState() {
275 function updateState() {
@@ -297,7 +297,7 @@ Showable {
297 script: {
297 script: {
298 yVelocityCalculator.reset();
298 yVelocityCalculator.reset();
299 // initial item selection
299 // initial item selection
300− if (!d.hasCommitted) bar.selectItemAt(d.activeDragHandle ? d.activeDragHandle.touchX : -1);
300+ if (!d.hasCommitted) bar.selectItemAt(d.activeDragHandle ? d.activeDragHandle.touchPosition.x : -1);
301 d.hasCommitted = false;
301 d.hasCommitted = false;
302 }
302 }
303 }
303 }
@@ -315,7 +315,7 @@ Showable {
315 target: leftScroller
315 target: leftScroller
316 lateralPosition: {
316 lateralPosition: {
317 if (!d.activeDragHandle) return -1;
317 if (!d.activeDragHandle) return -1;
318− var mapped = d.activeDragHandle.mapToItem(leftScroller, d.activeDragHandle.touchX, 0);
318+ var mapped = d.activeDragHandle.mapToItem(leftScroller, d.activeDragHandle.touchPosition.x, 0);
319 return mapped.x;
319 return mapped.x;
320 }
320 }
321 }
321 }
@@ -324,7 +324,7 @@ Showable {
324 target: rightScroller
324 target: rightScroller
325 lateralPosition: {
325 lateralPosition: {
326 if (!d.activeDragHandle) return -1;
326 if (!d.activeDragHandle) return -1;
327− var mapped = d.activeDragHandle.mapToItem(rightScroller, d.activeDragHandle.touchX, 0);
327+ var mapped = d.activeDragHandle.mapToItem(rightScroller, d.activeDragHandle.touchPosition.x, 0);
328 return mapped.x;
328 return mapped.x;
329 }
329 }
330 }
330 }