From 45370afa95890868837750b7593d9d192099e476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20B=C3=B6rchers?= Date: Sun, 12 Jul 2020 16:00:12 +0200 Subject: [PATCH] small changes --- .../PropertyPresenter/MagicSymbolConverter.cs | 16 +++++++++++++--- .../PropertyPresenter/PropertyPresenter.xaml | 3 ++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Controls/PropertyPresenter/MagicSymbolConverter.cs b/Controls/PropertyPresenter/MagicSymbolConverter.cs index 345444f..f65c217 100644 --- a/Controls/PropertyPresenter/MagicSymbolConverter.cs +++ b/Controls/PropertyPresenter/MagicSymbolConverter.cs @@ -7,6 +7,7 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Documents; using System.Windows.Media; + namespace Controls { /// @@ -73,7 +74,7 @@ namespace Controls var block = new TextBlock(); foreach (var tc in textComponents) { - var run = new Run(tc.Text) { FontFamily = new FontFamily("Palatino Linotype"), FontSize = 16 }; + var run = new Run(tc.Text) {FontFamily = new FontFamily("Palatino Linotype"), FontSize = 16}; switch (tc.Style) { case BaselineAlignment.Subscript: @@ -85,8 +86,10 @@ namespace Controls run.FontSize = 12; break; } + block.Inlines.Add(run); } + block.HorizontalAlignment = HorizontalAlignment.Right; block.VerticalAlignment = VerticalAlignment.Center; return block; @@ -109,7 +112,10 @@ namespace Controls textComponents.Add(comp); snippet.Clear(); } - alignment = alignment == BaselineAlignment.Subscript ? BaselineAlignment.Baseline : BaselineAlignment.Subscript; + + alignment = alignment == BaselineAlignment.Subscript + ? BaselineAlignment.Baseline + : BaselineAlignment.Subscript; break; case '^': if (snippet.Length > 0) @@ -118,13 +124,17 @@ namespace Controls textComponents.Add(comp); snippet.Clear(); } - alignment = alignment == BaselineAlignment.Superscript ? BaselineAlignment.Baseline : BaselineAlignment.Superscript; + + alignment = alignment == BaselineAlignment.Superscript + ? BaselineAlignment.Baseline + : BaselineAlignment.Superscript; break; default: snippet.Append(c); break; } } + if (snippet.Length > 0) { var comp = new TextComponent(snippet.ToString(), alignment); diff --git a/Controls/PropertyPresenter/PropertyPresenter.xaml b/Controls/PropertyPresenter/PropertyPresenter.xaml index d4cd0ea..6d5aaba 100644 --- a/Controls/PropertyPresenter/PropertyPresenter.xaml +++ b/Controls/PropertyPresenter/PropertyPresenter.xaml @@ -89,10 +89,11 @@