Make TextBoxErrorTemplate look like current Rename UI error

Author: MDoerner

Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml

@@ -25,14 +25,14 @@
                 <Setter Property="Validation.ErrorTemplate">
                     <Setter.Value>
                         <ControlTemplate x:Name="TextBoxErrorTemplate">
-                            <StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
-                                <AdornedElementPlaceholder/>
+                            <Grid>
+                                <AdornedElementPlaceholder Grid.Row="0"/>
                                 <Image Source="{StaticResource InvalidTextImage}"
                                        Height="16"
                                        Margin="0,-8,-8,0"
                                        HorizontalAlignment="Right"
                                        VerticalAlignment="Top"/>
-                            </StackPanel>
+                            </Grid>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
@@ -55,10 +55,9 @@
                 <TextBlock Text="{Binding ArgumentType, Converter={StaticResource AnnotationArgumentTypeToStringConverter}}"/>
             </DataTemplate>
             <DataTemplate DataType="{x:Type local:IAnnotationArgumentViewModel}" x:Key="ArgumentMultiTypeTemplate">
-                <ComboBox 
-                    ItemsSource="{Binding Path=ApplicableArgumentTypes}"
-                    SelectedItem="{Binding Path=ArgumentType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    IsSynchronizedWithCurrentItem="True">
+                <ComboBox ItemsSource="{Binding Path=ApplicableArgumentTypes}"
+                          SelectedItem="{Binding Path=ArgumentType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          IsSynchronizedWithCurrentItem="True">                    
                     <ComboBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type annotations:AnnotationArgumentType}">
                             <TextBlock Text="{Binding Path=., Converter={StaticResource AnnotationArgumentTypeToStringConverter}}"/>
@@ -77,23 +76,27 @@
                 <DataTemplate.Resources>
                     <CollectionViewSource Source="{Binding InspectionNames}" x:Key="InspectionNamesView" />
                 </DataTemplate.Resources>
-                <StackPanel>
+                <StackPanel VerticalAlignment="Center">
                     <TextBox Text="{Binding ArgumentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
                              Style="{StaticResource TextBoxErrorStyle}"
+                             HorizontalAlignment="Stretch"
+                             VerticalAlignment="Stretch"
                              Visibility="{Binding ArgumentType, Converter={StaticResource DefaultArgumentVisibilityConverter}}">
                     </TextBox>
-                    <ComboBox 
-                        Visibility="{Binding ArgumentType, Converter={StaticResource BooleanArgumentVisibilityConverter}}"
-                        ItemsSource="{Binding Path=BooleanValues}"
-                        SelectedItem="{Binding Path=ArgumentValue, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}">
+                    <ComboBox Visibility="{Binding ArgumentType, Converter={StaticResource BooleanArgumentVisibilityConverter}}"
+                              ItemsSource="{Binding Path=BooleanValues}"
+                              SelectedItem="{Binding Path=ArgumentValue, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch">
                     </ComboBox>
-                    <ComboBox
-                        Visibility="{Binding ArgumentType, Converter={StaticResource InspectionArgumentVisibilityConverter}}"
-                        ItemsSource="{Binding Path=InspectionNames}"
-                        SelectedItem="{Binding Path=ArgumentValue, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}">
+                    <ComboBox Visibility="{Binding ArgumentType, Converter={StaticResource InspectionArgumentVisibilityConverter}}"
+                              ItemsSource="{Binding Path=InspectionNames}"
+                              SelectedItem="{Binding Path=ArgumentValue, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Path=., Converter={StaticResource InspectionToLocalizedNameConverter}, UpdateSourceTrigger=PropertyChanged}"/>
+                                <TextBlock Text="{Binding Path=., Converter={StaticResource InspectionToLocalizedNameConverter}, UpdateSourceTrigger=PropertyChanged}"
+                                           HorizontalAlignment="Stretch"
+                                           VerticalAlignment="Stretch"/>
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
@@ -116,11 +119,10 @@
             <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_DeclarationLabel}" FontWeight="DemiBold" />
             <TextBlock Text="{Binding Model.Target, Converter={StaticResource DeclarationToQualifiedNameConverter}}" Margin="5,0,0,5" FontWeight="Regular" />
             <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_AnnotationLabel}" FontWeight="DemiBold" />
-            <ComboBox 
-                ItemsSource="{Binding ApplicableAnnotations}"
-                SelectedItem="{Binding Annotation}"
-                IsSynchronizedWithCurrentItem="True"
-                Margin="5,0,5,5">
+            <ComboBox ItemsSource="{Binding ApplicableAnnotations}"
+                      SelectedItem="{Binding Annotation}"
+                      IsSynchronizedWithCurrentItem="True"
+                      Margin="5,0,5,5">
                 <ComboBox.ItemTemplate>
                     <DataTemplate DataType="{x:Type annotations:IAnnotation}">
                         <TextBlock Text="{Binding Path=., Converter={StaticResource AnnotationToCodeStringConverter}}"/>
@@ -133,14 +135,12 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
-            <Label 
-                Grid.Column="0" 
-                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentsLabel}" 
-                FontWeight="DemiBold" 
-                Margin="5,5,0,0" />
-            <StackPanel 
-                Grid.Column="1" 
-                Orientation="Horizontal">
+            <Label Grid.Column="0" 
+                   Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentsLabel}" 
+                   FontWeight="DemiBold" 
+                   Margin="5,5,0,0" />
+            <StackPanel Grid.Column="1" 
+                        Orientation="Horizontal">
                 <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_AddArgumentButtonLabel}"
                         Height="20"
                         Margin="5,2.5"
@@ -153,24 +153,21 @@
                         Command="{Binding RemoveAnnotationArgument}"/>
             </StackPanel>
         </Grid>
-        <DataGrid 
-            Grid.Row="3"
-            VerticalAlignment="Stretch"
-            ItemsSource="{Binding Path=AnnotationArguments}"
-            AutoGenerateColumns="False"
-            VerticalScrollBarVisibility="Auto"
-            Margin="5,0,0,5">
+        <DataGrid Grid.Row="3"
+                  VerticalAlignment="Stretch"
+                  ItemsSource="{Binding Path=AnnotationArguments}"
+                  AutoGenerateColumns="False"
+                  VerticalScrollBarVisibility="Auto"
+                  Margin="5,0,0,5">
             <DataGrid.Columns>
-                <DataGridTemplateColumn 
-                    Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentTypeHeader}"
-                    CellTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
-                    CellEditingTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
-                    Width="Auto"/>
-                <DataGridTemplateColumn 
-                    Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentValueHeader}"
-                    CellTemplate="{StaticResource ArgumentValueTemplate}"
-                    CellEditingTemplate="{StaticResource ArgumentValueTemplate}"
-                    Width="*"/>
+                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentTypeHeader}"
+                                        CellTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
+                                        CellEditingTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
+                                        Width="Auto"/>
+                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=AnnotateDeclarationDialog_ArgumentValueHeader}"
+                                        CellTemplate="{StaticResource ArgumentValueTemplate}"
+                                        CellEditingTemplate="{StaticResource ArgumentValueTemplate}"
+                                        Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
         <Grid Grid.Row="4" Background="{x:Static SystemColors.ControlDarkBrush}" Grid.IsSharedSizeScope="True">