ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated BindingHelper

Browse source
This commit is contained in:
Clemens 2021-12-01 20:15:48 +01:00
parent 0714a04a92
commit 928d12876f
7 changed files with 61 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
MapControl/Shared/BindingHelper.cs
View file

@ -17,18 +17,34 @@ namespace MapControl
{ {
internal static class BindingHelper internal static class BindingHelper
{ {
public static Binding GetBinding(this object sourceObject, string sourceProperty) /// <summary>
/// Returns a Binding to the specified dependency property of a FrameworkElement.
/// If the source property is itself already bound, the method returns the existing Binding,
/// otherwise it creates one with sourceElement as Source and sourcePropertyName as Path.
/// </summary>
public static Binding GetOrCreateBinding(
this FrameworkElement sourceElement, DependencyProperty sourceProperty, string sourcePropertyName)
{ {
return new Binding { Source = sourceObject, Path = new PropertyPath(sourceProperty) }; var sourceBinding = sourceElement.GetBindingExpression(sourceProperty);
return sourceBinding != null
? sourceBinding.ParentBinding
: new Binding { Source = sourceElement, Path = new PropertyPath(sourcePropertyName) };
} }
public static void ValidateProperty( /// <summary>
this FrameworkElement targetObject, DependencyProperty targetProperty, object sourceObject, string sourceProperty) /// Sets a Binding on the specified dependency property of targetElement, if the target property does
/// not yet have a value or a Binding assigned to it. The potentially assigned Binding is created by
/// GetOrCreateBinding(sourceElement, sourceProperty, sourcePropertyName).
/// </summary>
public static void SetBindingOnUnsetProperty(
this FrameworkElement targetElement, DependencyProperty targetProperty,
FrameworkElement sourceElement, DependencyProperty sourceProperty, string sourcePropertyName)
{ {
if (targetObject.GetValue(targetProperty) == null && if (targetElement.GetValue(targetProperty) == null &&
targetObject.GetBindingExpression(targetProperty) == null) targetElement.GetBindingExpression(targetProperty) == null)
{ {
targetObject.SetBinding(targetProperty, sourceObject.GetBinding(sourceProperty)); targetElement.SetBinding(targetProperty, GetOrCreateBinding(sourceElement, sourceProperty, sourcePropertyName));
} }
} }
} }

6
MapControl/Shared/MapScale.cs
View file

@ -46,10 +46,10 @@ namespace MapControl
{ {
MinWidth = 100d; MinWidth = 100d;
line.SetBinding(Shape.StrokeProperty, this.GetBinding(nameof(Stroke))); line.SetBinding(Shape.StrokeProperty, this.GetOrCreateBinding(StrokeProperty, nameof(Stroke)));
line.SetBinding(Shape.StrokeThicknessProperty, this.GetBinding(nameof(StrokeThickness))); line.SetBinding(Shape.StrokeThicknessProperty, this.GetOrCreateBinding(StrokeThicknessProperty, nameof(StrokeThickness)));
#if WINUI || UWP #if WINUI || UWP
label.SetBinding(TextBlock.ForegroundProperty, this.GetBinding(nameof(Foreground))); label.SetBinding(TextBlock.ForegroundProperty, this.GetOrCreateBinding(ForegroundProperty, nameof(Foreground)));
#endif #endif
Children.Add(line); Children.Add(line);
Children.Add(label); Children.Add(label);

4
MapControl/WPF/MapOverlay.WPF.cs
View file

@ -65,7 +65,9 @@ namespace MapControl
protected override void OnInitialized(EventArgs e) protected override void OnInitialized(EventArgs e)
{ {
base.OnInitialized(e); base.OnInitialized(e);
this.ValidateProperty(StrokeProperty, this, nameof(Foreground));
// If this.Stroke is not explicitly set, bind it to this.Foreground
this.SetBindingOnUnsetProperty(StrokeProperty, this, ForegroundProperty, nameof(Foreground));
} }
public Pen CreatePen() public Pen CreatePen()

11
MapControl/WinUI/MapContentControl.WinUI.cs
View file

@ -57,9 +57,14 @@ namespace MapControl
if (parentMap != null) if (parentMap != null)
{ {
this.ValidateProperty(BackgroundProperty, parentMap, nameof(MapBase.Background)); // If this.Background is not explicitly set, bind it to parentMap.Background
this.ValidateProperty(BorderBrushProperty, parentMap, nameof(MapBase.Foreground)); this.SetBindingOnUnsetProperty(BackgroundProperty, parentMap, Panel.BackgroundProperty, nameof(Background));
this.ValidateProperty(ForegroundProperty, parentMap, nameof(MapBase.Foreground));
// If this.Foreground is not explicitly set, bind it to parentMap.Foreground
this.SetBindingOnUnsetProperty(ForegroundProperty, parentMap, MapBase.ForegroundProperty, nameof(Foreground));
// If this.BorderBrush is not explicitly set, bind it to parentMap.Foreground
this.SetBindingOnUnsetProperty(BorderBrushProperty, parentMap, MapBase.ForegroundProperty, nameof(Foreground));
} }
} }
} }

22
MapControl/WinUI/MapGraticule.WinUI.cs
View file

@ -35,11 +35,11 @@ namespace MapControl
if (path == null) if (path == null)
{ {
path = new Path { Data = new PathGeometry() }; path = new Path { Data = new PathGeometry() };
path.SetBinding(Shape.StrokeProperty, this.GetBinding(nameof(Stroke))); path.SetBinding(Shape.StrokeProperty, this.GetOrCreateBinding(StrokeProperty, nameof(Stroke)));
path.SetBinding(Shape.StrokeThicknessProperty, this.GetBinding(nameof(StrokeThickness))); path.SetBinding(Shape.StrokeThicknessProperty, this.GetOrCreateBinding(StrokeThicknessProperty, nameof(StrokeThickness)));
path.SetBinding(Shape.StrokeDashArrayProperty, this.GetBinding(nameof(StrokeDashArray))); path.SetBinding(Shape.StrokeDashArrayProperty, this.GetOrCreateBinding(StrokeDashArrayProperty, nameof(StrokeDashArray)));
path.SetBinding(Shape.StrokeDashOffsetProperty, this.GetBinding(nameof(StrokeDashOffset))); path.SetBinding(Shape.StrokeDashOffsetProperty, this.GetOrCreateBinding(StrokeDashOffsetProperty, nameof(StrokeDashOffset)));
path.SetBinding(Shape.StrokeDashCapProperty, this.GetBinding(nameof(StrokeDashCap))); path.SetBinding(Shape.StrokeDashCapProperty, this.GetOrCreateBinding(StrokeDashCapProperty, nameof(StrokeDashCap)));
Children.Add(path); Children.Add(path);
} }
@ -115,15 +115,15 @@ namespace MapControl
else else
{ {
label = new TextBlock { RenderTransform = new MatrixTransform() }; label = new TextBlock { RenderTransform = new MatrixTransform() };
label.SetBinding(TextBlock.FontSizeProperty, this.GetBinding(nameof(FontSize))); label.SetBinding(TextBlock.FontSizeProperty, this.GetOrCreateBinding(FontSizeProperty, nameof(FontSize)));
label.SetBinding(TextBlock.FontStyleProperty, this.GetBinding(nameof(FontStyle))); label.SetBinding(TextBlock.FontStyleProperty, this.GetOrCreateBinding(FontStyleProperty, nameof(FontStyle)));
label.SetBinding(TextBlock.FontStretchProperty, this.GetBinding(nameof(FontStretch))); label.SetBinding(TextBlock.FontStretchProperty, this.GetOrCreateBinding(FontStretchProperty, nameof(FontStretch)));
label.SetBinding(TextBlock.FontWeightProperty, this.GetBinding(nameof(FontWeight))); label.SetBinding(TextBlock.FontWeightProperty, this.GetOrCreateBinding(FontWeightProperty, nameof(FontWeight)));
label.SetBinding(TextBlock.ForegroundProperty, this.GetBinding(nameof(Foreground))); label.SetBinding(TextBlock.ForegroundProperty, this.GetOrCreateBinding(ForegroundProperty, nameof(Foreground)));
if (FontFamily != null) if (FontFamily != null)
{ {
label.SetBinding(TextBlock.FontFamilyProperty, this.GetBinding(nameof(FontFamily))); label.SetBinding(TextBlock.FontFamilyProperty, this.GetOrCreateBinding(FontFamilyProperty, nameof(FontFamily)));
} }
Children.Add(label); Children.Add(label);

11
MapControl/WinUI/MapItemsControl.WinUI.cs
View file

@ -45,9 +45,14 @@ namespace MapControl
if (parentMap != null) if (parentMap != null)
{ {
this.ValidateProperty(BackgroundProperty, parentMap, nameof(MapBase.Background)); // If this.Background is not explicitly set, bind it to parentMap.Background
this.ValidateProperty(BorderBrushProperty, parentMap, nameof(MapBase.Foreground)); this.SetBindingOnUnsetProperty(BackgroundProperty, parentMap, Panel.BackgroundProperty, nameof(Background));
this.ValidateProperty(ForegroundProperty, parentMap, nameof(MapBase.Foreground));
// If this.Foreground is not explicitly set, bind it to parentMap.Foreground
this.SetBindingOnUnsetProperty(ForegroundProperty, parentMap, MapBase.ForegroundProperty, nameof(Foreground));
// If this.BorderBrush is not explicitly set, bind it to parentMap.Foreground
this.SetBindingOnUnsetProperty(BorderBrushProperty, parentMap, MapBase.ForegroundProperty, nameof(Foreground));
} }
} }
} }

7
MapControl/WinUI/MapOverlay.WinUI.cs
View file

@ -71,8 +71,11 @@ namespace MapControl
{ {
if (map != null) if (map != null)
{ {
this.ValidateProperty(ForegroundProperty, map, nameof(MapBase.Foreground)); // If this.Forground is not explicitly set, bind it to map.Foreground
this.ValidateProperty(StrokeProperty, this, nameof(Foreground)); this.SetBindingOnUnsetProperty(ForegroundProperty, map, MapBase.ForegroundProperty, nameof(Foreground));
// If this.Stroke is not explicitly set, bind it to this.Foreground
this.SetBindingOnUnsetProperty(StrokeProperty, this, ForegroundProperty, nameof(Foreground));
} }
base.SetParentMap(map); base.SetParentMap(map);