Resolve some conflicts

dotnet · Sep 6, 2023 · 7be11e0 · 7be11e0
1 parent 1af479a
commit 7be11e0
Showing 1 changed file with 4 additions and 30 deletions.
diff --git a/src/Controls/src/Core/PointerGestureRecognizer.cs b/src/Controls/src/Core/PointerGestureRecognizer.cs
@@ -225,53 +225,27 @@ internal void SendPointerMoved(View sender, Func<IElement?, Point?>? getPosition
 		/// <summary>
 		/// For internal use by the .NET MAUI platform.
 		/// </summary>
-		internal void SendPointerPressed(View sender, Func<IElement?, Point?>? getPosition)
+		internal void SendPointerPressed(View sender, Func<IElement?, Point?>? getPosition, PlatformPointerEventArgs? platformArgs = null)
 		{
 			ICommand cmd = PointerPressedCommand;
 			if (cmd?.CanExecute(PointerPressedCommandParameter) == true)
 				cmd.Execute(PointerPressedCommandParameter);
 
 			EventHandler<PointerEventArgs>? handler = PointerPressed;
-			handler?.Invoke(sender, new PointerEventArgs(getPosition));
-		}
-
-		/// <summary>
-		/// For internal use by the .NET MAUI platform.
-		/// </summary>
-		internal void SendPointerReleased(View sender, Func<IElement?, Point?>? getPosition)
-		{
-			ICommand cmd = PointerReleasedCommand;
-			if (cmd?.CanExecute(PointerReleasedCommandParameter) == true)
-				cmd.Execute(PointerReleasedCommandParameter);
-
-			EventHandler<PointerEventArgs>? handler = PointerReleased;
-			handler?.Invoke(sender, new PointerEventArgs(getPosition));
-		}
-
-		/// <summary>
-		/// For internal use by the .NET MAUI platform.
-		/// </summary>
-		internal void SendPointerPressed(View sender, Func<IElement?, Point?>? getPosition)
-		{
-			ICommand cmd = PointerPressedCommand;
-			if (cmd?.CanExecute(PointerPressedCommandParameter) == true)
-				cmd.Execute(PointerPressedCommandParameter);
-
-			EventHandler<PointerEventArgs>? handler = PointerPressed;
-			handler?.Invoke(sender, new PointerEventArgs(getPosition));
+			handler?.Invoke(sender, new PointerEventArgs(getPosition, platformArgs));
 		}
 
 		/// <summary>
 		/// For internal use by the .NET MAUI platform.
 		/// </summary>
-		internal void SendPointerReleased(View sender, Func<IElement?, Point?>? getPosition)
+		internal void SendPointerReleased(View sender, Func<IElement?, Point?>? getPosition, PlatformPointerEventArgs? platformArgs = null)
 		{
 			ICommand cmd = PointerReleasedCommand;
 			if (cmd?.CanExecute(PointerReleasedCommandParameter) == true)
 				cmd.Execute(PointerReleasedCommandParameter);
 
 			EventHandler<PointerEventArgs>? handler = PointerReleased;
-			handler?.Invoke(sender, new PointerEventArgs(getPosition));
+			handler?.Invoke(sender, new PointerEventArgs(getPosition, platformArgs));
 		}
 
 		internal static void SetupForPointerOverVSM(