chore: bring back all of Windows.UI.Input

unoplatform · Nov 21, 2024 · 022cb54 · 022cb54
1 parent 1e7970e
commit 022cb54
Show file tree

Hide file tree

Showing 23 changed files with 62 additions and 23 deletions.
diff --git a/src/Uno.UI/UI/Input/DraggingEventArgs.cs b/src/Uno.UI/UI/Input/DraggingEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using Windows.Devices.Input;
 using Windows.Foundation;
 
@@ -27,3 +29,4 @@ internal DraggingEventArgs(PointerPoint point, DraggingState state, uint contact
 		public uint ContactCount { get; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/DraggingState.cs b/src/Uno.UI/UI/Input/DraggingState.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 #if HAS_UNO_WINUI && IS_UNO_UI_PROJECT
 namespace Microsoft.UI.Input
 #else
@@ -11,3 +13,4 @@ public enum DraggingState
 		Completed,
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.Gesture.cs b/src/Uno.UI/UI/Input/GestureRecognizer.Gesture.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 #nullable enable
 
 using System;
@@ -398,3 +400,4 @@ public static bool IsOutOfTapRange(Point p1, Point p2)
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs b/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 #nullable enable
 
 using System;
@@ -216,3 +218,4 @@ public void RunSync()
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.cs b/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.cs
@@ -1,4 +1,6 @@
-#nullable enable
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
+#nullable enable
 
 using System;
 using System.Collections.Generic;
@@ -751,3 +753,4 @@ public static implicit operator Points(PointerPoint pointer1)
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.cs b/src/Uno.UI/UI/Input/GestureRecognizer.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -291,3 +293,4 @@ private static ulong GetPointerIdentifier(PointerPoint point)
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/GestureSettings.cs b/src/Uno.UI/UI/Input/GestureSettings.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System;
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
@@ -108,3 +110,4 @@ internal static class GestureSettingsHelper
 			| GestureSettings.ManipulationRotateInertia;
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/HoldingEventArgs.cs b/src/Uno.UI/UI/Input/HoldingEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using Windows.Devices.Input;
 using Windows.Foundation;
 using Uno;
@@ -33,3 +35,4 @@ internal HoldingEventArgs(uint pointerId, PointerDeviceType type, Point position
 		public uint CurrentContactCount => HoldingState == HoldingState.Started ? 1u : 0u;
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/HoldingState.cs b/src/Uno.UI/UI/Input/HoldingState.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 #if HAS_UNO_WINUI && IS_UNO_UI_PROJECT
 namespace Microsoft.UI.Input
 #else
@@ -11,3 +13,4 @@ public enum HoldingState
 		Canceled,
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationCompletedEventArgs.cs b/src/Uno.UI/UI/Input/ManipulationCompletedEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System.Linq;
 using Windows.Devices.Input;
 using Windows.Foundation;
@@ -49,3 +51,4 @@ internal ManipulationCompletedEventArgs(
 		internal bool IsInertial { get; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationDelta.cs b/src/Uno.UI/UI/Input/ManipulationDelta.cs
@@ -1,4 +1,6 @@
-using System;
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
+using System;
 using System.Collections.Generic;
 using Windows.Foundation;
 
@@ -80,3 +82,4 @@ public override int GetHashCode()
 		#endregion
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationInertiaStartingEventArgs.cs b/src/Uno.UI/UI/Input/ManipulationInertiaStartingEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System.Linq;
 using Windows.Devices.Input;
 using Windows.Foundation;
@@ -48,3 +50,4 @@ internal ManipulationInertiaStartingEventArgs(
 		internal GestureRecognizer.Manipulation.InertiaProcessor Processor { get; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationStartedEventArgs.cs b/src/Uno.UI/UI/Input/ManipulationStartedEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System.Linq;
 using Windows.Devices.Input;
 using Windows.Foundation;
@@ -38,3 +40,4 @@ internal ManipulationStartedEventArgs(
 		public uint ContactCount { get; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationStartingEventArgs.cs b/src/Uno.UI/UI/Input/ManipulationStartingEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System;
 using System.Linq;
 using Windows.Devices.Input;
@@ -26,3 +28,4 @@ internal ManipulationStartingEventArgs(PointerIdentifier pointer, GestureSetting
 		public GestureSettings Settings { get; set; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationUpdatedEventArgs.cs b/src/Uno.UI/UI/Input/ManipulationUpdatedEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System.Linq;
 using System.Reflection;
 using Windows.Devices.Input;
@@ -52,3 +54,4 @@ internal ManipulationUpdatedEventArgs(
 		internal bool IsInertial { get; }
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/ManipulationVelocities.cs b/src/Uno.UI/UI/Input/ManipulationVelocities.cs
@@ -1,4 +1,6 @@
-using System;
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
+using System;
 using System.Collections.Generic;
 using Windows.Foundation;
 
@@ -64,3 +66,4 @@ public override int GetHashCode()
 		#endregion
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/RightTappedEventArgs.cs b/src/Uno.UI/UI/Input/RightTappedEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using Windows.Devices.Input;
 using Windows.Foundation;
 
@@ -33,3 +35,4 @@ public uint ContactCount
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/TappedEventArgs.cs b/src/Uno.UI/UI/Input/TappedEventArgs.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using Windows.Devices.Input;
 using Windows.Foundation;
 
@@ -36,3 +38,4 @@ public uint ContactCount
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UWP/Uno.Reference.csproj b/src/Uno.UWP/Uno.Reference.csproj
@@ -31,10 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
+		<Compile Include="..\Uno.UI\UI\Input\*.cs" />
 		<Compile Include="..\Uno.UI\UI\Colors.cs" />
 		<Compile Include="..\Uno.UI\UI\ColorHelper.cs" />
 		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />

diff --git a/src/Uno.UWP/Uno.Skia.csproj b/src/Uno.UWP/Uno.Skia.csproj
@@ -33,10 +33,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
+		<Compile Include="..\Uno.UI\UI\Input\*.cs" />
 		<Compile Include="..\Uno.UI\UI\Colors.cs" />
 		<Compile Include="..\Uno.UI\UI\ColorHelper.cs" />
 		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />

diff --git a/src/Uno.UWP/Uno.Tests.csproj b/src/Uno.UWP/Uno.Tests.csproj
@@ -28,10 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
+		<Compile Include="..\Uno.UI\UI\Input\*.cs" />
 		<Compile Include="..\Uno.UI\UI\Colors.cs" />
 		<Compile Include="..\Uno.UI\UI\ColorHelper.cs" />
 		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />

diff --git a/src/Uno.UWP/Uno.Wasm.csproj b/src/Uno.UWP/Uno.Wasm.csproj
@@ -27,10 +27,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
+		<Compile Include="..\Uno.UI\UI\Input\*.cs" />
 		<Compile Include="..\Uno.UI\UI\Colors.cs" />
 		<Compile Include="..\Uno.UI\UI\ColorHelper.cs" />
 		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />

diff --git a/src/Uno.UWP/Uno.netcoremobile.csproj b/src/Uno.UWP/Uno.netcoremobile.csproj
@@ -43,10 +43,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
+		<Compile Include="..\Uno.UI\UI\Input\*.cs" />
 		<Compile Include="..\Uno.UI\UI\Colors.cs" />
 		<Compile Include="..\Uno.UI\UI\ColorHelper.cs" />
 		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />