Skip to content

Commit f18c1ec

Browse files
clean up
1 parent 2cb2f69 commit f18c1ec

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/MaterialDesignThemes.Wpf/Converters/ViewIsGridViewConverter.cs renamed to src/MaterialDesignThemes.Wpf/Converters/Internal/ViewIsGridViewConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Globalization;
22
using System.Windows.Data;
33

4-
namespace MaterialDesignThemes.Wpf.Converters;
4+
namespace MaterialDesignThemes.Wpf.Converters.Internal;
55

66
internal class ViewIsGridViewConverter : IValueConverter
77
{

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
4+
xmlns:internalConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
45
xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
56
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
6-
<converters:ViewIsGridViewConverter x:Key="ViewIsGridViewConverter" />
7+
<internalConverters:ViewIsGridViewConverter x:Key="ViewIsGridViewConverter" />
78

89
<Style x:Key="MaterialDesignTreeListViewToggleButtonStyle" TargetType="{x:Type ToggleButton}">
910
<Setter Property="Background" Value="Transparent" />
11+
<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=wpf:TreeListViewItem}}" />
1012
<Setter Property="Focusable" Value="False" />
1113
<Setter Property="Height" Value="16" />
1214
<Setter Property="Template">
@@ -229,7 +231,7 @@
229231
<Setter TargetName="Ripple" Property="Feedback" Value="Transparent" />
230232
<Setter TargetName="SelectedBorder" Property="Visibility" Value="Collapsed" />
231233
</DataTrigger>
232-
<DataTrigger Binding="{Binding View, RelativeSource={RelativeSource Self}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
234+
<DataTrigger Binding="{Binding View, RelativeSource={RelativeSource AncestorType=wpf:TreeListView}, Converter={StaticResource ViewIsGridViewConverter}}" Value="True">
233235
<Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
234236
<Setter TargetName="PART_GridViewRowPresenterr" Property="Visibility" Value="Visible" />
235237
</DataTrigger>

0 commit comments

Comments
 (0)