From 4608909ca940585dfd78924f7b9ea781e2cb85db Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Tue, 1 May 2018 12:59:47 +0200
Subject: [PATCH] Version 4.9.0: Reworked MapPanel child arrangement.

---
 MapControl/Shared/MapOverlay.cs  | 13 -------------
 MapControl/UWP/MapOverlay.UWP.cs |  5 +++++
 MapControl/WPF/MapOverlay.WPF.cs | 11 +++++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/MapControl/Shared/MapOverlay.cs b/MapControl/Shared/MapOverlay.cs
index c5a6764b..439ab8a6 100644
--- a/MapControl/Shared/MapOverlay.cs
+++ b/MapControl/Shared/MapOverlay.cs
@@ -10,9 +10,7 @@ using Windows.UI.Xaml.Media;
 #else
 using System.Windows;
 using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Media;
-using System.Windows.Shapes;
 #endif
 
 namespace MapControl
@@ -22,17 +20,6 @@ namespace MapControl
     /// </summary>
     public partial class MapOverlay : MapPanel
     {
-        public MapOverlay()
-        {
-            Loaded += (s, e) =>
-            {
-                if (Stroke == null)
-                {
-                    SetBinding(StrokeProperty, GetBinding(ForegroundProperty, nameof(Foreground)));
-                }
-            };
-        }
-
         public FontFamily FontFamily
         {
             get { return (FontFamily)GetValue(FontFamilyProperty); }
diff --git a/MapControl/UWP/MapOverlay.UWP.cs b/MapControl/UWP/MapOverlay.UWP.cs
index 2f8f2b30..10ef5744 100644
--- a/MapControl/UWP/MapOverlay.UWP.cs
+++ b/MapControl/UWP/MapOverlay.UWP.cs
@@ -65,6 +65,11 @@ namespace MapControl
                     new Binding { Source = map, Path = new PropertyPath("Foreground") });
             }
 
+            if (Stroke == null)
+            {
+                SetBinding(StrokeProperty, GetBinding(ForegroundProperty, nameof(Foreground)));
+            }
+
             base.SetParentMap(map);
         }
     }
diff --git a/MapControl/WPF/MapOverlay.WPF.cs b/MapControl/WPF/MapOverlay.WPF.cs
index 90b82969..72fc753d 100644
--- a/MapControl/WPF/MapOverlay.WPF.cs
+++ b/MapControl/WPF/MapOverlay.WPF.cs
@@ -56,6 +56,17 @@ namespace MapControl
         public static readonly DependencyProperty StrokeMiterLimitProperty = Shape.StrokeMiterLimitProperty.AddOwner(
             typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
+        public MapOverlay()
+        {
+            Loaded += (s, e) =>
+            {
+                if (Stroke == null)
+                {
+                    SetBinding(StrokeProperty, GetBinding(ForegroundProperty, nameof(Foreground)));
+                }
+            };
+        }
+
         public Pen CreatePen()
         {
             return new Pen