Skip to content

Commit d34b879

Browse files
committed
Fix up the BasedOn styles - apparently WPF doesn't like us re-using the same name as the BasedOn.
1 parent b988333 commit d34b879

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
<TreeView.ItemTemplate>
534534
<HierarchicalDataTemplate DataType="codeExplorer:ICodeExplorerNode" ItemsSource="{Binding Children}" ItemContainerStyle="{StaticResource TreeViewContainerStyle}">
535535
<HierarchicalDataTemplate.Resources>
536-
<Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
536+
<Style x:Key="TreeViewItemStyleModified" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
537537
<Setter Property="Text" Value="{Binding Name}" />
538538
<Style.Triggers>
539539
<DataTrigger Binding="{Binding ElementName=DisplaySignatures, Path=IsChecked}" Value="True">
@@ -558,7 +558,7 @@
558558
</Image>
559559
<Image Source="{Binding Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{StaticResource ToolbarIconStyle}" />
560560
</Grid>
561-
<TextBlock Style="{StaticResource TreeViewItemStyle}" />
561+
<TextBlock Style="{StaticResource TreeViewItemStyleModified}" />
562562
</StackPanel>
563563
</HierarchicalDataTemplate>
564564
</TreeView.ItemTemplate>

Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</Style>
7373
</HierarchicalDataTemplate.ItemContainerStyle>
7474
<HierarchicalDataTemplate.Resources>
75-
<Style x:Key="TreeViewItemStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
75+
<Style x:Key="TreeViewItemStyleModified" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource TreeViewItemStyle}">
7676
<Setter Property="Text" Value="{Binding NameWithSignature}" />
7777
</Style>
7878
</HierarchicalDataTemplate.Resources>
@@ -91,7 +91,7 @@
9191
</Image>
9292
<Image Source="{Binding Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{StaticResource ToolbarIconStyle}" />
9393
</Grid>
94-
<TextBlock Style="{StaticResource TreeViewItemStyle}" />
94+
<TextBlock Style="{StaticResource TreeViewItemStyleModified}" />
9595
</StackPanel>
9696
</HierarchicalDataTemplate>
9797
</TreeView.ItemTemplate>

Rubberduck.Core/UI/Controls/GroupingGrid.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
1818

19-
<Style x:Key="PrettifyRow" TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource PrettifyRow}">
19+
<Style x:Key="PrettifyRowModified" TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource PrettifyRow}">
2020
<EventSetter Event="MouseDoubleClick" Handler="GroupingGridItem_MouseDoubleClick" />
2121
<Setter Property="Height" Value="Auto" />
2222
<Setter Property="MinHeight" Value="26" />
@@ -79,7 +79,7 @@
7979
<Setter Property="VerticalGridLinesBrush" Value="Transparent" />
8080
<Setter Property="HeadersVisibility" Value="Column" />
8181
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
82-
<Setter Property="ItemContainerStyle" Value="{StaticResource PrettifyRow}" />
82+
<Setter Property="ItemContainerStyle" Value="{StaticResource PrettifyRowModified}" />
8383
<Setter Property="ColumnHeaderHeight" Value="22" />
8484
</Style>
8585
</DataGrid.Style>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<BitmapImage x:Key="RemoveParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
2121
<BitmapImage x:Key="RestoreParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" />
2222

23-
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
23+
<Style x:Key="PrettyListBoxItemModified" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
2424
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
2525
</Style>
2626
</ResourceDictionary>
@@ -49,7 +49,7 @@
4949
ItemsSource="{Binding Parameters, UpdateSourceTrigger=PropertyChanged}"
5050
SelectedIndex="0"
5151
Name="ParameterGrid"
52-
ItemContainerStyle="{StaticResource PrettyListBoxItem}"
52+
ItemContainerStyle="{StaticResource PrettyListBoxItemModified}"
5353
AlternationCount="2">
5454
<ListBox.ItemTemplate>
5555
<DataTemplate>

Rubberduck.Core/UI/Settings/SettingsControl.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ResourceDictionary.MergedDictionaries>
1919
<converters:SettingsViewToPageConverter x:Key="SettingsViewToPage" />
2020

21-
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
21+
<Style x:Key="PrettyListBoxItemModified" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource PrettyListBoxItem}">
2222
<Setter Property="BorderBrush" Value="Transparent"/>
2323
<Setter Property="BorderThickness" Value="0"/>
2424
</Style>
@@ -47,7 +47,7 @@
4747
<ListBox Name="ListBox"
4848
Grid.Row="1"
4949
Grid.Column="0"
50-
ItemContainerStyle="{StaticResource PrettyListBoxItem}"
50+
ItemContainerStyle="{StaticResource PrettyListBoxItemModified}"
5151
ItemsSource="{Binding SettingsViews}"
5252
DisplayMemberPath="Label"
5353
SelectedItem="{Binding SelectedSettingsView, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

0 commit comments

Comments
 (0)