From 22d5aadb9dbdb0dc62e6062cf94bb77b63d2d133 Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sat, 21 Jan 2023 16:08:23 +0100 Subject: [PATCH] Minor changes --- MapControl/Shared/MapPanel.cs | 6 ++++-- MapControl/WinUI/CanvasPanel.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index abcd6a86..8877a1a2 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -264,7 +264,8 @@ namespace MapControl private static void ArrangeElement(FrameworkElement element, Point position) { - var rect = new Rect(position, GetDesiredSize(element)); + var size = GetDesiredSize(element); + var rect = new Rect(position.X, position.Y, size.Width, size.Height); switch (element.HorizontalAlignment) { @@ -299,7 +300,8 @@ namespace MapControl private static void ArrangeElement(FrameworkElement element, Size parentSize) { - var rect = new Rect(new Point(), GetDesiredSize(element)); + var size = GetDesiredSize(element); + var rect = new Rect(0d, 0d, size.Width, size.Height); switch (element.HorizontalAlignment) { diff --git a/MapControl/WinUI/CanvasPanel.cs b/MapControl/WinUI/CanvasPanel.cs index e2d786e6..69e243c2 100644 --- a/MapControl/WinUI/CanvasPanel.cs +++ b/MapControl/WinUI/CanvasPanel.cs @@ -37,9 +37,9 @@ namespace MapControl { var x = Canvas.GetLeft(element); var y = Canvas.GetTop(element); - var p = new Point(double.IsNaN(x) ? 0d : x, double.IsNaN(y) ? 0d : y); + var size = MapPanel.GetDesiredSize(element); - element.Arrange(new Rect(p, MapPanel.GetDesiredSize(element))); + element.Arrange(new Rect(x, y, size.Width, size.Height)); } return finalSize;