From 6a81d192b651fc181767defd79fb1bb3611b2fc5 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Fri, 13 Jan 2023 11:43:42 +0100
Subject: [PATCH] Update MapPanel.cs

---
 MapControl/Shared/MapPanel.cs | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index a5b31073..3d3617c4 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -173,35 +173,28 @@ namespace MapControl
                         }
                     }
 
-                    try
+                    if (position.HasValue)
                     {
-                        if (position.HasValue)
+                        ArrangeElement(element, position.Value);
+                    }
+                    else
+                    {
+                        var boundingBox = GetBoundingBox(element);
+
+                        if (boundingBox != null)
                         {
-                            ArrangeElement(element, position.Value);
+                            var viewRect = GetViewRect(boundingBox);
+
+                            if (viewRect != null)
+                            {
+                                ArrangeElement(element, viewRect);
+                            }
                         }
                         else
                         {
-                            var boundingBox = GetBoundingBox(element);
-
-                            if (boundingBox != null)
-                            {
-                                var viewRect = GetViewRect(boundingBox);
-
-                                if (viewRect != null)
-                                {
-                                    ArrangeElement(element, viewRect);
-                                }
-                            }
-                            else
-                            {
-                                ArrangeElement(element, finalSize);
-                            }
+                            ArrangeElement(element, finalSize);
                         }
                     }
-                    catch (Exception ex)
-                    {
-                        Debug.WriteLine($"MapPanel.ArrangeElement: {ex.Message}");
-                    }
                 }
             }
 
@@ -372,7 +365,14 @@ namespace MapControl
                 rect.Height = Math.Round(rect.Height);
             }
 
-            element.Arrange(rect);
+            try
+            {
+                element.Arrange(rect);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"MapPanel.ArrangeElement: {ex.Message}");
+            }
         }
 
         private static void ParentMapPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)