fix: Changed default PointerID to 1 to match UWP

unoplatform · Apr 27, 2021 · 0a30b82 · 0a30b82
1 parent f0b29e3
commit 0a30b82
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/GtkCoreWindowExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/GtkCoreWindowExtension.cs
@@ -260,7 +260,7 @@ private static PointerEventArgs AsPointerArgs(Event evt)
 			var position = new Windows.Foundation.Point(x, y);
 			EventHelper.GetState(evt, out var state);
 
-			var pointerId = 0u;
+			var pointerId = 1u;
 			var modifiers = GetKeyModifiers(state);
 			var properties = new PointerPointProperties();
 

diff --git a/src/Uno.UI.Runtime.Skia.Tizen/TizenCoreWindowExtension.cs b/src/Uno.UI.Runtime.Skia.Tizen/TizenCoreWindowExtension.cs
@@ -95,7 +95,7 @@ private void OnMove(GestureLayer.MomentumData data)
 							frameId: GetNextFrameId(),
 							timestamp: Math.Max(data.VerticalSwipeTimestamp, data.HorizontalSwipeTimestamp),
 							device: PointerDevice.For(PointerDeviceType.Touch),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: point,
 							position: point,
 							isInContact: properties.HasPressedButton,
@@ -127,7 +127,7 @@ private void OnTapStart(GestureLayer.TapData data)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)data.Timestamp,
 							device: PointerDevice.For(PointerDeviceType.Touch),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: point,
 							position: point,
 							isInContact: properties.HasPressedButton,
@@ -157,7 +157,7 @@ private void OnTapEnd(GestureLayer.TapData data)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)data.Timestamp,
 							device: PointerDevice.For(PointerDeviceType.Touch),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: point,
 							position: point,
 							isInContact: properties.HasPressedButton,

diff --git a/src/Uno.UI.Runtime.Skia.Wpf/WpfCoreWindowExtension.cs b/src/Uno.UI.Runtime.Skia.Wpf/WpfCoreWindowExtension.cs
@@ -131,7 +131,7 @@ private void HostOnMouseEnter(object sender, MouseEventArgs args)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)args.Timestamp,
 							device: GetPointerDevice(args),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: new Windows.Foundation.Point(position.X, position.Y),
 							position: new Windows.Foundation.Point(position.X, position.Y),
 							isInContact: properties.HasPressedButton,
@@ -161,7 +161,7 @@ private void HostOnMouseLeave(object sender, MouseEventArgs args)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)args.Timestamp,
 							device: GetPointerDevice(args),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: new Windows.Foundation.Point(position.X, position.Y),
 							position: new Windows.Foundation.Point(position.X, position.Y),
 							isInContact: properties.HasPressedButton,
@@ -191,7 +191,7 @@ private void HostOnMouseMove(object sender, MouseEventArgs args)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)args.Timestamp,
 							device: GetPointerDevice(args),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: new Windows.Foundation.Point(position.X, position.Y),
 							position: new Windows.Foundation.Point(position.X, position.Y),
 							isInContact: properties.HasPressedButton,
@@ -221,7 +221,7 @@ private void HostOnMouseDown(object sender, MouseButtonEventArgs args)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)args.Timestamp,
 							device: GetPointerDevice(args),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: new Windows.Foundation.Point(position.X, position.Y),
 							position: new Windows.Foundation.Point(position.X, position.Y),
 							isInContact: true,
@@ -251,7 +251,7 @@ private void HostOnMouseUp(object sender, MouseButtonEventArgs args)
 							frameId: GetNextFrameId(),
 							timestamp: (uint)args.Timestamp,
 							device: GetPointerDevice(args),
-							pointerId: 0,
+							pointerId: 1,
 							rawPosition: new Windows.Foundation.Point(position.X, position.Y),
 							position: new Windows.Foundation.Point(position.X, position.Y),
 							isInContact: properties.HasPressedButton,
@@ -320,7 +320,7 @@ private IntPtr OnWmMessage(IntPtr hwnd, int msg, IntPtr wparamOriginal, IntPtr l
 								frameId: GetNextFrameId(),
 								timestamp: (uint)Environment.TickCount,
 								device: PointerDevice.For(PointerDeviceType.Mouse),
-								pointerId: 0,
+								pointerId: 1,
 								rawPosition: position,
 								position: position,
 								isInContact: properties.HasPressedButton,

diff --git a/src/Uno.UI/Controls/Window.macOS.cs b/src/Uno.UI/Controls/Window.macOS.cs
@@ -169,7 +169,7 @@ private static PointerPoint GetPointerPoint(NSEvent nativeEvent, Point posInWind
 			var pointerDevice = PointerDevice.For(pointerDeviceType);
 			var pointerId = pointerDeviceType == PointerDeviceType.Pen
 				? (uint)nativeEvent.PointingDeviceID()
-				: (uint)0;
+				: (uint)1;
 			var isInContact = GetIsInContact(nativeEvent);
 			var properties = GetPointerProperties(nativeEvent, pointerDeviceType);