Make sure that style modification have BasedOn attribute and further consolidated styles that are re-used.

Author: bclothier

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -47,7 +47,6 @@
             <BitmapImage x:Key="ExtractInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ExtractInterface.png" />
 
             <converters:BooleanToNullableDoubleConverter x:Key="BoolToDouble" />
-            <converters:BooleanToDimmedBrushConverter x:Key="BooleanToDimmed" />
             <converters:TemplateCommandParameterToTupleConverter x:Key="TemplateCommandParameterToTuple" />
             <converters:InvertBoolValueConverter x:Key="NotBool" />
             <converters:CodeExplorerNodeToIconConverter x:Key="NodeToIcon" />
@@ -534,21 +533,9 @@
             <TreeView.ItemTemplate>
                 <HierarchicalDataTemplate DataType="codeExplorer:ICodeExplorerNode" ItemsSource="{Binding Children}" ItemContainerStyle="{StaticResource TreeViewContainerStyle}">
                     <HierarchicalDataTemplate.Resources>
-                        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}">
+                        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
                             <Setter Property="Text" Value="{Binding Name}" />
-                            <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TreeView}}, Path=FontSize}" />
-                            <Setter Property="FontWeight" Value="{Binding FontWeight}"/>
-                            <Setter Property="Margin" Value="2,0,2,0" />
-                            <Setter Property="VerticalAlignment" Value="Center" />
-                            <Setter Property="ToolTip" Value="{Binding ToolTip}" />
-                            <Setter Property="ToolTipService.InitialShowDelay" Value="500" />
-                            <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-                            <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
                             <Style.Triggers>
-                                <DataTrigger Binding="{Binding IsObsolete}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
-                                    <Setter Property="TextDecorations" Value="Strikethrough" />
-                                </DataTrigger>
                                 <DataTrigger Binding="{Binding ElementName=DisplaySignatures, Path=IsChecked}" Value="True">
                                     <Setter Property="Text" Value="{Binding NameWithSignature}" />
                                 </DataTrigger>

Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml

@@ -20,7 +20,6 @@
                 <ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <converters:BooleanToDimmedBrushConverter x:Key="BooleanToDimmed" />
             <converters:CodeExplorerNodeToIconConverter x:Key="NodeToIcon" />
             <converters:AccessibilityToIconConverter x:Key="AccessibilityToIcon" />
         </ResourceDictionary>
@@ -73,22 +72,8 @@
                         </Style>
                     </HierarchicalDataTemplate.ItemContainerStyle>
                     <HierarchicalDataTemplate.Resources>
-                        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}">
+                        <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
                             <Setter Property="Text" Value="{Binding NameWithSignature}" />
-                            <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TreeView}}, Path=FontSize}" />
-                            <Setter Property="FontWeight" Value="{Binding FontWeight}"/>
-                            <Setter Property="Margin" Value="2,0,2,0" />
-                            <Setter Property="VerticalAlignment" Value="Center" />
-                            <Setter Property="ToolTip" Value="{Binding ToolTip}" />
-                            <Setter Property="ToolTipService.InitialShowDelay" Value="500" />
-                            <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-                            <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding IsObsolete}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
-                                    <Setter Property="TextDecorations" Value="Strikethrough" />
-                                </DataTrigger>
-                            </Style.Triggers>
                         </Style>
                     </HierarchicalDataTemplate.Resources>
                     <StackPanel Orientation="Horizontal">

Rubberduck.Core/UI/Controls/GroupingGrid.xaml

@@ -16,7 +16,7 @@
 
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
 
-            <Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}">
+            <Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource PrettifyRow}">
                 <EventSetter Event="MouseDoubleClick" Handler="GroupingGridItem_MouseDoubleClick" />
                 <Setter Property="Height" Value="Auto" />
                 <Setter Property="MinHeight" Value="26" />

Rubberduck.Core/UI/Controls/ToolBar.xaml

@@ -6,6 +6,9 @@
         <ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
+    <converters:GroupingGridLocationConverter x:Key="GroupingGridLocationConverter" />
+    <converters:BooleanToDimmedBrushConverter x:Key="BooleanToDimmed" />
+
     <DataTemplate x:Key="MenuItemHeaderDropdownIndicatorTemplate">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
             <ContentPresenter Content="{Binding}"/>
@@ -22,8 +25,6 @@
         <Setter Property="Margin" Value="4" />
     </Style>
 
-    <converters:GroupingGridLocationConverter x:Key="GroupingGridLocationConverter" />
-
     <Style x:Key="MenuItemStyle" TargetType="{x:Type MenuItem}">
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ItemsControl}}}"/>
@@ -442,4 +443,24 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    <Style x:Key="ToolBarToggleStyle" TargetType="ToggleButton">
+        <Setter Property="Margin" Value="2" />
+        <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+    </Style>
+    <Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TreeView}}, Path=FontSize}" />
+        <Setter Property="FontWeight" Value="{Binding FontWeight}"/>
+        <Setter Property="Margin" Value="2,0,2,0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="ToolTip" Value="{Binding ToolTip}" />
+        <Setter Property="ToolTipService.InitialShowDelay" Value="500" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsObsolete}" Value="True">
+                <Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
+                <Setter Property="TextDecorations" Value="Strikethrough" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>

Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml

@@ -49,10 +49,7 @@
                 <ToolBar.Resources>
                     <codeInspections:InspectionFilterToBooleanConverter x:Key="InspectionTypeToBooleanConverter" />
                     <codeInspections:InspectionResultGroupingToBooleanConverter x:Key="GroupingToBooleanConverter" />
-                    <Style x:Key="ToolBarToggleStyle" TargetType="ToggleButton">
-                        <Setter Property="Margin" Value="2" />
-                        <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
-                    </Style>
+                    
                     <BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
                     <BitmapImage x:Key="SettingsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/gear.png" />
                     <BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml

@@ -20,7 +20,7 @@
             <BitmapImage x:Key="RemoveParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
             <BitmapImage x:Key="RestoreParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" />
 
-            <Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
+            <Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
                 <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
             </Style>
         </ResourceDictionary>

Rubberduck.Core/UI/Settings/SettingsControl.xaml

@@ -18,7 +18,7 @@
             </ResourceDictionary.MergedDictionaries>
             <converters:SettingsViewToPageConverter x:Key="SettingsViewToPage" />
 
-            <Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
+            <Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
                 <Setter Property="BorderBrush" Value="Transparent"/>
                 <Setter Property="BorderThickness" Value="0"/>
             </Style>

Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml

@@ -42,10 +42,7 @@
                 <ToolBar.Resources>
                     <converters:ToDoItemGroupingToBooleanConverter x:Key="GroupByLocationConverter" />
                     <converters:ToDoItemGroupingToBooleanConverter x:Key="GroupByMarkerConverter" />
-                    <Style x:Key="ToolBarToggleStyle" TargetType="ToggleButton">
-                        <Setter Property="Margin" Value="2" />
-                        <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
-                    </Style>
+                    
                     <Style TargetType="Image">
                         <Setter Property="Height" Value="16" />
                     </Style>

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

@@ -74,10 +74,7 @@
                     <local:TestExplorerGroupingBooleanConverter x:Key="LocationConverter" />
                     <local:TestExplorerGroupingBooleanConverter x:Key="CategoryConverter" />
                     <local:TestExplorerOutcomeFilterToBooleanConverter x:Key="OutcomeFilterConverter" />
-                    <Style x:Key="ToolBarToggleStyle" TargetType="ToggleButton">
-                        <Setter Property="Margin" Value="2" />
-                        <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
-                    </Style>
+                    
                     <Style TargetType="Image">
                         <Setter Property="Height" Value="16" />
                     </Style>