feat(effectiveviewport): Make sure to raise the UIElement.EffectiveVi…

…ewportChanged on Arrange on Skia
unoplatform · Nov 16, 2020 · 3c896e5 · 3c896e5
1 parent c8ba949
commit 3c896e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Uno.UI/Media/NativeRenderTransformAdapter.Skia.cs b/src/Uno.UI/Media/NativeRenderTransformAdapter.Skia.cs
@@ -17,7 +17,7 @@ partial void Initialized()
 
 		partial void Apply(bool isSizeChanged, bool isOriginChanged)
 		{
-			Owner.Visual.TransformMatrix = new Matrix4x4(Transform.ToMatrix(new Windows.Foundation.Point(CurrentOrigin.X * CurrentSize.Width, CurrentOrigin.Y * CurrentSize.Height)));
+			Owner.Visual.TransformMatrix = new Matrix4x4(Transform.ToMatrix(CurrentOrigin, CurrentSize));
 		}
 
 		partial void Cleanup()

diff --git a/src/Uno.UI/UI/Xaml/UIElement.Skia.cs b/src/Uno.UI/UI/Xaml/UIElement.Skia.cs
@@ -245,6 +245,7 @@ internal void ArrangeVisual(Rect finalRect, Rect? clippedFrame = default)
 				}
 
 				OnArrangeVisual(newRect, clip);
+				OnViewportUpdated(clippedFrame ?? Rect.Empty);
 			}
 			else
 			{
@@ -261,7 +262,6 @@ internal virtual void OnArrangeVisual(Rect rect, Rect? clip)
 			Visual.CenterPoint = new Vector3((float)RenderTransformOrigin.X, (float)RenderTransformOrigin.Y, 0);
 
 			ApplyNativeClip(clip ?? Rect.Empty);
-
 		}
 
 		partial void ApplyNativeClip(Rect clip)