Fixed issue where ICoordinateRemapper was bypassed when dragging touch inputs

yesyesnono · valyard · commit b7afb7d025f2 · 2018-02-05T19:21:48.000+03:00
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs
@@ -115,7 +115,7 @@ public bool UpdateInput()
                         {
                             if (touchState.Phase != TouchPhase.Canceled)
                             {
-                                touchState.Pointer.Position = t.position;
+                                touchState.Pointer.Position = remapCoordinates(t.position);
                                 updatePointer(touchState.Pointer);
                             }
                         }
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/WindowsPointerHandlers.cs
@@ -503,7 +503,7 @@ private void nativePointer(int id, PointerEvent evt, PointerType type, Vector2 p
                             releasePointer(mousePointer);
                             break;
                         case PointerEvent.Update:
-                            mousePointer.Position = position;
+                            mousePointer.Position = remapCoordinates(position);
                             mousePointer.Buttons = updateButtons(mousePointer.Buttons, data.PointerFlags, data.ChangedButtons);
                             updatePointer(mousePointer);
                             break;
@@ -539,7 +539,7 @@ private void nativePointer(int id, PointerEvent evt, PointerType type, Vector2 p
                             break;
                         case PointerEvent.Update:
                             if (!winTouchToInternalId.TryGetValue(id, out touchPointer)) return;
-                            touchPointer.Position = position;
+                            touchPointer.Position = remapCoordinates(position);
                             touchPointer.Rotation = getTouchRotation(ref data);
                             touchPointer.Pressure = getTouchPressure(ref data);
                             updatePointer(touchPointer);
@@ -579,7 +579,7 @@ private void nativePointer(int id, PointerEvent evt, PointerType type, Vector2 p
                             break;
                         case PointerEvent.Update:
                             if (penPointer == null) break;
-                            penPointer.Position = position;
+                            penPointer.Position = remapCoordinates(position);
                             penPointer.Pressure = getPenPressure(ref data);
                             penPointer.Rotation = getPenRotation(ref data);
                             penPointer.Buttons = updateButtons(penPointer.Buttons, data.PointerFlags, data.ChangedButtons);

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public bool UpdateInput()`
`115`	`115`	`{`
`116`	`116`	`if (touchState.Phase != TouchPhase.Canceled)`
`117`	`117`	`{`
`118`		`- touchState.Pointer.Position = t.position;`
	`118`	`+ touchState.Pointer.Position = remapCoordinates(t.position);`
`119`	`119`	`updatePointer(touchState.Pointer);`
`120`	`120`	`}`
`121`	`121`	`}`