Merge pull request #17973 from Youssef1313/maximize-issue

fix: Maximizing causes the app to not be responsive
unoplatform · Aug 19, 2024 · 4396251 · 4396251
2 parents 3295c52 + 35faeee
commit 4396251
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs
@@ -773,7 +773,7 @@ public async Task When_CornerRadius()
 		[DataRow(true, true)]
 		[DataRow(false, true)]
 		[DataRow(false, false)]
-		public async Task When_Border_CorderRadius_HitTesting(bool addBorderChild, bool addGridBackground)
+		public async Task When_Border_CornerRadius_HitTesting(bool addBorderChild, bool addGridBackground)
 		{
 			var borderPressedCount = 0;
 			var rectanglePressedCount = 0;

diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs b/src/Uno.UI/UI/Xaml/Controls/Border/Border.cs
@@ -329,14 +329,18 @@ protected override void OnBackgroundChanged(DependencyPropertyChangedEventArgs e
 
 	internal override bool IsViewHit() => IsViewHitImpl(this);
 
-	internal static bool IsViewHitImpl(FrameworkElement element)
+	internal static bool IsViewHitImpl(IBorderInfoProvider element)
 	{
 		_Debug.Assert(element is Panel
 			|| element is Border
 			|| element is ContentPresenter
 		);
 
-		return element.Background != null;
+		return element.Background != null
+#if __SKIA__
+			|| element.BorderBrush != null
+#endif
+			;
 	}
 
 #if !UNO_HAS_BORDER_VISUAL

diff --git a/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs b/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
@@ -662,16 +662,13 @@ internal static (UIElement? element, Branch? stale) SearchDownForTopMostElementA
 
 			// We didn't find any child at the given position, validate that element can be touched,
 			// and the position is in actual bounds(which might be different than the clipping bounds)
-#if __SKIA__
-			if (renderingBounds.Contains(testPosition) && element.HitTest(transformToElement.Inverse().Transform(testPosition)))
-#else
-
 			if (elementHitTestVisibility == HitTestability.Visible && renderingBounds.Contains(testPosition)
-#if __WASM__
+#if __SKIA__
+				&& element.HitTest(transformToElement.Inverse().Transform(testPosition))
+#elif __WASM__
 				&& element.HitTest(testPosition)
 #endif
 				)
-#endif
 			{
 				TRACE($"> LEAF! ({element.GetDebugName()} is the OriginalSource) | stale branch: {stale?.ToString() ?? "-- none --"}");
 				return (element, stale);