From 5f8556ac2997e106fee00d5120c6fc9e9ee2aadb Mon Sep 17 00:00:00 2001 From: Mike Pohatu Date: Mon, 17 Apr 2017 16:43:00 +1200 Subject: [PATCH] added multiline support to validation errors and helptext --- TsGui/Validation/ValidationErrorToolTip.xaml | 2 +- TsGui/View/GuiOptions/GuiOptionBaseUI.xaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TsGui/Validation/ValidationErrorToolTip.xaml b/TsGui/Validation/ValidationErrorToolTip.xaml index 51f7bb3e..2c0abe30 100644 --- a/TsGui/Validation/ValidationErrorToolTip.xaml +++ b/TsGui/Validation/ValidationErrorToolTip.xaml @@ -28,6 +28,6 @@ BorderThickness="1" Padding="7,5,7,5" HorizontalContentAlignment="Left" VerticalAlignment="Top" Template="{StaticResource TextBoxBaseControlTemplate}" - Text="{Binding ValidationText}"/> + Text="{Binding ValidationText, Converter={StaticResource XmlStringLine}}"/> diff --git a/TsGui/View/GuiOptions/GuiOptionBaseUI.xaml b/TsGui/View/GuiOptions/GuiOptionBaseUI.xaml index 0566c7b2..cbbd71f5 100644 --- a/TsGui/View/GuiOptions/GuiOptionBaseUI.xaml +++ b/TsGui/View/GuiOptions/GuiOptionBaseUI.xaml @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., mc:Ignorable="d" d:DesignHeight="20" d:DesignWidth="300" Visibility="{Binding Visibility}" IsEnabled="{Binding IsEnabled}"> + ToolTip="{Binding HelpText, Converter={StaticResource XmlStringLine}}" Margin="{Binding Margin}" Orientation="Horizontal" >