From 20f49c625cd32b95154db138ed7eeebbadd04bf7 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 1 Nov 2021 14:53:16 +0200
Subject: Color selection and Job sequence package. Redesign list control, move
 Color Selection View to dialogs, implement save.

---
 Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml')

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
index dcb52859e..c95c87782 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
@@ -8,7 +8,8 @@
                     xmlns:local="clr-namespace:Tango.Touch.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <components:SharedResourceDictionary Source="../Resources/Colors.xaml" />
+        <!--<components:SharedResourceDictionary Source="../Resources/Colors.xaml" />-->
+        <ResourceDictionary Source="../Resources/Colors.xaml" />
 
         <ResourceDictionary>
             <converters:StringNullOrEmptyToBooleanConverter x:Key="StringNullOrEmptyToBooleanConverter" />
@@ -39,7 +40,7 @@
                         <DockPanel>
                             <Border DockPanel.Dock="Bottom" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.HasError),Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <Canvas>
-                                    <TextBlock FontSize="12" Width="{Binding RelativeSource={RelativeSource AncestorType=Border},Path=ActualWidth}" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.Errors).CurrentItem.ErrorContent}"></TextBlock>
+                                    <TextBlock FontSize="12" Width="{Binding RelativeSource={RelativeSource AncestorType=Border},Path=ActualWidth}" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.Errors)/ErrorContent}"></TextBlock>
                                 </Canvas>
                             </Border>
                             <DockPanel>
-- 
cgit v1.3.1