From d1efb9f3430dfc7d525a3ecc90c938fe4c713810 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Tue, 3 Sep 2024 12:11:04 +0200
Subject: [PATCH] FlowDirection must be LeftToRight

---
 MapControl/Avalonia/MapBase.Avalonia.cs  | 7 ++++++-
 MapControl/Avalonia/Themes/Generic.axaml | 7 -------
 MapControl/WPF/MapBase.WPF.cs            | 3 ++-
 MapControl/WPF/Themes/Generic.xaml       | 5 -----
 MapControl/WinUI/MapBase.WinUI.cs        | 4 +++-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/MapControl/Avalonia/MapBase.Avalonia.cs b/MapControl/Avalonia/MapBase.Avalonia.cs
index 31cd6b33..a0555e70 100644
--- a/MapControl/Avalonia/MapBase.Avalonia.cs
+++ b/MapControl/Avalonia/MapBase.Avalonia.cs
@@ -35,7 +35,7 @@ namespace MapControl
     public partial class MapBase
     {
         public static readonly StyledProperty<Brush> ForegroundProperty =
-            DependencyPropertyHelper.AddOwner<MapBase, Brush>(TextElement.ForegroundProperty);
+            DependencyPropertyHelper.AddOwner<MapBase, Brush>(TextElement.ForegroundProperty, Brushes.Black);
 
         public static readonly StyledProperty<Easing> AnimationEasingProperty =
             DependencyPropertyHelper.Register<MapBase, Easing>(nameof(AnimationEasing), new QuadraticEaseOut());
@@ -104,6 +104,11 @@ namespace MapControl
             Animation.RegisterCustomAnimator<Location, LocationAnimator>();
         }
 
+        public MapBase()
+        {
+            FlowDirection = FlowDirection.LeftToRight; // OverrideDefaultValue won't stop value inheritance
+        }
+
         public double ActualWidth => Bounds.Width;
         public double ActualHeight => Bounds.Height;
 
diff --git a/MapControl/Avalonia/Themes/Generic.axaml b/MapControl/Avalonia/Themes/Generic.axaml
index 7001d103..caecb9b0 100644
--- a/MapControl/Avalonia/Themes/Generic.axaml
+++ b/MapControl/Avalonia/Themes/Generic.axaml
@@ -3,13 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:map="clr-namespace:MapControl">
 
-    <ControlTheme TargetType="map:MapBase" x:Key="{x:Type map:MapBase}">
-        <Setter Property="FlowDirection" Value="LeftToRight"/>
-        <Setter Property="Foreground" Value="Black"/>
-    </ControlTheme>
-
-    <ControlTheme TargetType="map:Map" x:Key="{x:Type map:Map}" BasedOn="{StaticResource {x:Type map:MapBase}}"/>
-
     <ControlTemplate TargetType="ContentControl" x:Key="ContentControlTemplate">
         <ContentPresenter
             Content="{TemplateBinding Content}"
diff --git a/MapControl/WPF/MapBase.WPF.cs b/MapControl/WPF/MapBase.WPF.cs
index 759186f6..125066e2 100644
--- a/MapControl/WPF/MapBase.WPF.cs
+++ b/MapControl/WPF/MapBase.WPF.cs
@@ -12,7 +12,7 @@ namespace MapControl
     public partial class MapBase
     {
         public static readonly DependencyProperty ForegroundProperty =
-            DependencyPropertyHelper.AddOwner<MapBase, Brush>(TextElement.ForegroundProperty);
+            DependencyPropertyHelper.AddOwner<MapBase, Brush>(TextElement.ForegroundProperty, Brushes.Black);
 
         public static readonly DependencyProperty AnimationEasingFunctionProperty =
             DependencyPropertyHelper.Register<MapBase, IEasingFunction>(nameof(AnimationEasingFunction),
@@ -78,6 +78,7 @@ namespace MapControl
             BackgroundProperty.OverrideMetadata(typeof(MapBase), new FrameworkPropertyMetadata(Brushes.White));
             ClipToBoundsProperty.OverrideMetadata(typeof(MapBase), new FrameworkPropertyMetadata(true));
             DefaultStyleKeyProperty.OverrideMetadata(typeof(MapBase), new FrameworkPropertyMetadata(typeof(MapBase)));
+            FlowDirectionProperty.OverrideMetadata(typeof(MapBase), new FrameworkPropertyMetadata(FlowDirection.LeftToRight) { Inherits = false });
         }
 
         /// <summary>
diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml
index bd8eca18..d7cb6d22 100644
--- a/MapControl/WPF/Themes/Generic.xaml
+++ b/MapControl/WPF/Themes/Generic.xaml
@@ -3,11 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:map="clr-namespace:MapControl">
 
-    <Style TargetType="map:MapBase">
-        <Setter Property="FlowDirection" Value="LeftToRight"/>
-        <Setter Property="Foreground" Value="Black"/>
-    </Style>
-
     <Style TargetType="map:MapItemsControl">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/MapControl/WinUI/MapBase.WinUI.cs b/MapControl/WinUI/MapBase.WinUI.cs
index 9caaa4ec..9ce90deb 100644
--- a/MapControl/WinUI/MapBase.WinUI.cs
+++ b/MapControl/WinUI/MapBase.WinUI.cs
@@ -79,9 +79,11 @@ namespace MapControl
             //
             var style = new Style(typeof(MapBase));
             style.Setters.Add(new Setter(BackgroundProperty, new SolidColorBrush(Colors.White)));
-            style.Setters.Add(new Setter(FlowDirectionProperty, FlowDirection.LeftToRight));
+            style.Seal();
             Style = style;
 
+            FlowDirection = FlowDirection.LeftToRight;
+
             SizeChanged += OnSizeChanged;
         }