fix: Do not apply ScrollOffsets if the source element is the scroll port

unoplatform · Apr 4, 2022 · b115cb4 · b115cb4
1 parent 6c0038f
commit b115cb4
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.cs b/src/Uno.UI/UI/Xaml/UIElement.cs
@@ -452,12 +452,11 @@ internal static Matrix3x2 GetTransform(UIElement from, UIElement to)
 					}
 				}
 
-				// TODO: Valid?
-				//if (elt.IsScrollPort) // Managed SCP or custom scroller
-				//{
-				//	offsetX -= elt.ScrollOffsets.X;
-				//	offsetY -= elt.ScrollOffsets.Y;
-				//}
+				if (elt.IsScrollPort && elt != from) // Managed SCP or custom scroller
+				{
+					offsetX -= elt.ScrollOffsets.X;
+					offsetY -= elt.ScrollOffsets.Y;
+				}
 #endif
 
 				logInfoString?.Append($"{elt}: ({offsetX}, {offsetY}), ");