Fix Layout margin issue (#44)

rookiejava · Jul 8, 2021 · 3c6ed6e · 3c6ed6e
1 parent 1f38e6a
commit 3c6ed6e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.Tizen.cs b/src/Core/src/Handlers/Layout/LayoutHandler.Tizen.cs
@@ -126,13 +126,20 @@ protected void OnLayoutUpdated(object? sender, LayoutEventArgs e)
 				{
 					VirtualView.InvalidateMeasure();
 					VirtualView.InvalidateArrange();
-					VirtualView.Measure(nativeGeometry.Width, nativeGeometry.Height);
 
 					if (!_layoutUpdatedRegistered)
 					{
 						nativeGeometry.X = VirtualView.Frame.X;
 						nativeGeometry.Y = VirtualView.Frame.Y;
 					}
+
+					// revoke margin area, we need to assign area including margin
+					nativeGeometry.Width += VirtualView.Margin.HorizontalThickness;
+					nativeGeometry.Height += VirtualView.Margin.VerticalThickness;
+					nativeGeometry.X -= VirtualView.Margin.Left;
+					nativeGeometry.Y -= VirtualView.Margin.Top;
+
+					VirtualView.Measure(nativeGeometry.Width, nativeGeometry.Height);
 					VirtualView.Arrange(nativeGeometry);
 				}
 			}