From 8b08a3b8e639837acc788e1e4795c0fac4dff1f4 Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sat, 1 Jun 2024 11:27:13 +0200 Subject: [PATCH] PushpinBorder ArrangeOverride --- MapControl/Avalonia/PushpinBorder.Avalonia.cs | 15 ++++++--------- MapControl/WPF/PushpinBorder.WPF.cs | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/MapControl/Avalonia/PushpinBorder.Avalonia.cs b/MapControl/Avalonia/PushpinBorder.Avalonia.cs index 37e27c36..08c48269 100644 --- a/MapControl/Avalonia/PushpinBorder.Avalonia.cs +++ b/MapControl/Avalonia/PushpinBorder.Avalonia.cs @@ -76,16 +76,13 @@ namespace MapControl protected override Size ArrangeOverride(Size size) { - if (Child != null) - { - Child.Arrange(new Rect( - BorderWidth + Padding.Left, - BorderWidth + Padding.Top, - size.Width - BorderWidth - Padding.Right, - size.Height - BorderWidth - Padding.Bottom)); - } + Child?.Arrange(new Rect( + BorderWidth + Padding.Left, + BorderWidth + Padding.Top, + Child.DesiredSize.Width, + Child.DesiredSize.Height)); - return size; + return DesiredSize; } public override void Render(DrawingContext drawingContext) diff --git a/MapControl/WPF/PushpinBorder.WPF.cs b/MapControl/WPF/PushpinBorder.WPF.cs index 031bd500..ad87ab31 100644 --- a/MapControl/WPF/PushpinBorder.WPF.cs +++ b/MapControl/WPF/PushpinBorder.WPF.cs @@ -86,16 +86,13 @@ namespace MapControl protected override Size ArrangeOverride(Size size) { - if (Child != null) - { - Child.Arrange(new Rect( - BorderWidth + Padding.Left, - BorderWidth + Padding.Top, - size.Width - BorderWidth - Padding.Right, - size.Height - BorderWidth - Padding.Bottom)); - } + Child?.Arrange(new Rect( + BorderWidth + Padding.Left, + BorderWidth + Padding.Top, + Child.DesiredSize.Width, + Child.DesiredSize.Height)); - return size; + return DesiredSize; } protected override void OnRender(DrawingContext drawingContext)