chore: Adjust nullability

unoplatform · Jun 27, 2022 · 154e850 · 154e850
1 parent 507da10
commit 154e850
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Internal/VisualTree.uno.cs b/src/Uno.UI/UI/Xaml/Internal/VisualTree.uno.cs
@@ -10,7 +10,7 @@ internal partial class VisualTree : IWeakReferenceProvider
 	private const int UnoTopZIndex = int.MaxValue - 100;
 	private const int FocusVisualZIndex = UnoTopZIndex + 1;
 
-	private ManagedWeakReference _selfWeakReference;
+	private ManagedWeakReference? _selfWeakReference;
 
 	public Canvas? FocusVisualRoot { get; private set; }
 

diff --git a/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs b/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
@@ -369,7 +369,7 @@ static VisualTreeHelper()
 
 		internal static (UIElement? element, Branch? stale) HitTest(
 			Point position,
-			XamlRoot xamlRoot,
+			XamlRoot? xamlRoot,
 			GetHitTestability? getTestability = null,
 			Predicate<UIElement>? isStale = null
 #if TRACE_HIT_TESTING
@@ -381,7 +381,7 @@ internal static (UIElement? element, Branch? stale) HitTest(
 			)
 		{
 #endif
-			if (xamlRoot.VisualTree.RootElement is UIElement root)
+			if (xamlRoot?.VisualTree.RootElement is UIElement root)
 			{
 				return SearchDownForTopMostElementAt(position, root, getTestability ?? DefaultGetTestability, isStale);
 			}
@@ -681,7 +681,7 @@ private static void TRACE(FormattableString msg)
 		internal struct Branch
 		{
 			public static Branch ToWindowRoot(UIElement leaf)
-				=> new Branch(leaf.XamlRoot.VisualTree.RootElement, leaf);
+				=> new Branch(Window.Current.RootElement, leaf);
 
 			public Branch(UIElement root, UIElement leaf)
 			{

diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs
@@ -105,10 +105,10 @@ internal void ClearHitTestVisibilityForRoot()
 		#endregion
 
 		partial void CapturePointerNative(Pointer pointer)
-			=> XamlRoot.VisualTree.ContentRoot.InputManager!.SetPointerCapture(pointer.UniqueId);
+			=> XamlRoot?.VisualTree.ContentRoot.InputManager!.SetPointerCapture(pointer.UniqueId);
 
 		partial void ReleasePointerNative(Pointer pointer)
-			=> XamlRoot.VisualTree.ContentRoot.InputManager!.ReleasePointerCapture(pointer.UniqueId);
+			=> XamlRoot?.VisualTree.ContentRoot.InputManager!.ReleasePointerCapture(pointer.UniqueId);
 	}
 }
 #endif