From ea2cd438fac30940fc7b55e991d8b75f1b9542ef Mon Sep 17 00:00:00 2001 From: ClemensF Date: Tue, 1 May 2018 02:31:47 +0200 Subject: [PATCH] Version 4.9.0: Reworked MapPanel child arrangement. --- MapControl/Shared/MapOverlay.cs | 25 +++++++++++++++++++++++++ MapControl/UWP/MapGraticule.UWP.cs | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/MapControl/Shared/MapOverlay.cs b/MapControl/Shared/MapOverlay.cs index 6f5b2e6c..07606129 100644 --- a/MapControl/Shared/MapOverlay.cs +++ b/MapControl/Shared/MapOverlay.cs @@ -110,6 +110,31 @@ namespace MapControl set { SetValue(StrokeMiterLimitProperty, value); } } + public Binding FontSizeBinding + { + get { return GetBinding(FontSizeProperty, nameof(FontSize)); } + } + + public Binding FontFamilyBinding + { + get { return GetBinding(FontFamilyProperty, nameof(FontFamily)); } + } + + public Binding FontStyleBinding + { + get { return GetBinding(FontStyleProperty, nameof(FontStyle)); } + } + + public Binding FontStretchBinding + { + get { return GetBinding(FontStretchProperty, nameof(FontStretch)); } + } + + public Binding FontWeightBinding + { + get { return GetBinding(FontWeightProperty, nameof(FontWeight)); } + } + public Binding ForegroundBinding { get { return GetBinding(ForegroundProperty, nameof(Foreground)); } diff --git a/MapControl/UWP/MapGraticule.UWP.cs b/MapControl/UWP/MapGraticule.UWP.cs index 81fda294..c955f256 100644 --- a/MapControl/UWP/MapGraticule.UWP.cs +++ b/MapControl/UWP/MapGraticule.UWP.cs @@ -116,6 +116,14 @@ namespace MapControl renderTransform.Children.Add(new TranslateTransform()); label = new TextBlock { RenderTransform = renderTransform }; + if (FontFamily != null) + { + label.SetBinding(TextBlock.FontFamilyProperty, FontFamilyBinding); + } + label.SetBinding(TextBlock.FontSizeProperty, FontSizeBinding); + label.SetBinding(TextBlock.FontStyleProperty, FontStyleBinding); + label.SetBinding(TextBlock.FontStretchProperty, FontStretchBinding); + label.SetBinding(TextBlock.FontWeightProperty, FontWeightBinding); label.SetBinding(TextBlock.ForegroundProperty, ForegroundBinding); Children.Add(label);