From 9cb854b584fae2c9ceb62d3a7c0d0dd7a5ae77d8 Mon Sep 17 00:00:00 2001
From: Ben <ben-wallis@users.noreply.github.com>
Date: Wed, 15 Jul 2015 19:10:51 +0100
Subject: [PATCH] Fixed Usages: 0 being visible when editing a non-master theme

---
 .../Views/ThemeComponentControl.xaml          | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
index e4c5853..ea830e2 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
@@ -21,30 +21,29 @@
         </Grid.RowDefinitions>
         <Grid.Resources>
             <DataTemplate x:Key="EditableComponentNameTemplate">
-                <TextBox Text="{Binding ComponentName}" />
+                <StackPanel>
+                    <TextBlock Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
+                               FontSize="10"
+                               HorizontalAlignment="Right"
+                               Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding UsageCount}" Value="0">
+                                        <Setter Property="Foreground" Value="Red" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                                <Setter Property="Foreground" Value="SteelBlue" />
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
+                    <TextBox Text="{Binding ComponentName}" />
+                </StackPanel>
             </DataTemplate>
             <DataTemplate x:Key="ViewOnlyComponentNameTemplate">
                 <TextBlock Text="{Binding ComponentName}" ToolTip="{Binding ComponentName}" />
             </DataTemplate>
         </Grid.Resources>
-        <DockPanel LastChildFill="True">
-            <TextBlock DockPanel.Dock="Left"
-                       Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
-                       FontSize="10"
-                       HorizontalAlignment="Right"
-                       Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding UsageCount}" Value="0">
-                                <Setter Property="Foreground" Value="Red" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                        <Setter Property="Foreground" Value="SteelBlue" />
-                    </Style>
-                </TextBlock.Style>
-            </TextBlock>
-        </DockPanel>
         <ContentControl Grid.Row="1" Content="{Binding}">
             <ContentControl.Style>
                 <Style TargetType="ContentControl">
@@ -59,7 +58,6 @@
                 </Style>
             </ContentControl.Style>
         </ContentControl>
-
         <xctk:ColorPicker Grid.Row="2" SelectedColor="{Binding Color}" />
     </Grid>
 </UserControl>