From 9ba43d3a1811fa58c0d7cc3ffafef71caf569108 Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Tue, 1 May 2018 13:53:24 +0200
Subject: [PATCH] Version 4.9.0: Reworked MapPanel child arrangement.

---
 MapControl/WPF/MapOverlay.WPF.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/MapControl/WPF/MapOverlay.WPF.cs b/MapControl/WPF/MapOverlay.WPF.cs
index 72fc753d..dadb3237 100644
--- a/MapControl/WPF/MapOverlay.WPF.cs
+++ b/MapControl/WPF/MapOverlay.WPF.cs
@@ -12,25 +12,25 @@ namespace MapControl
     public partial class MapOverlay
     {
         public static readonly DependencyProperty FontFamilyProperty = TextElement.FontFamilyProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty FontSizeProperty = TextElement.FontSizeProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty FontStyleProperty = TextElement.FontStyleProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty FontStretchProperty = TextElement.FontStretchProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty FontWeightProperty = TextElement.FontWeightProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty ForegroundProperty = TextElement.ForegroundProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { Inherits = true, AffectsRender = true, DefaultValue = null });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, Inherits = true });
 
         public static readonly DependencyProperty StrokeProperty = Shape.StrokeProperty.AddOwner(
-            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true, DefaultValue = null });
+            typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
 
         public static readonly DependencyProperty StrokeThicknessProperty = Shape.StrokeThicknessProperty.AddOwner(
             typeof(MapOverlay), new FrameworkPropertyMetadata { AffectsRender = true });
@@ -58,6 +58,9 @@ namespace MapControl
 
         public MapOverlay()
         {
+            // Set Stroke Binding in a Loaded handler to allow Stroke value from a Style Setter.
+            // SetParentMap is called too early.
+
             Loaded += (s, e) =>
             {
                 if (Stroke == null)