Skip to content

Update Treeview to offer new options #2359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 2 commits into from
Jul 7, 2021
Merged

Update Treeview to offer new options #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3d0e51
Add two new properties to TreeView
StefanoRivolta-Previero Jun 30, 2021
d80bd41
Showcase changes in demo app
StefanoRivolta-Previero Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion MainDemo.Wpf/Trees.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,13 @@
<TreeView
Grid.Row="0"
ItemsSource="{Binding MovieCategories}"
MinWidth="220"
MinWidth="220"
SelectedItemChanged="TreeView_SelectedItemChanged">
<TreeView.Resources>
<Style TargetType="TreeViewItem" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
<Setter Property="materialDesign:TreeViewAssist.ExpanderSize" Value="32"/>
<Setter Property="materialDesign:TreeViewAssist.ShowSelection" Value="False"/>
</Style>
<HierarchicalDataTemplate
DataType="{x:Type domain:MovieCategory}"
ItemsSource="{Binding Movies}">
Expand Down
20 changes: 15 additions & 5 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@
<Setter Property="Focusable" Value="False"/>
<Setter Property="Width" Value="16"/>
<Setter Property="Height" Value="16"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border Background="Transparent" Height="16" Width="16">
<Border Background="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CheckStates">
<VisualStateGroup.Transitions>
Expand Down Expand Up @@ -162,6 +163,8 @@
<Setter Property="Padding" Value="8" />
<Setter Property="FocusVisualStyle" Value="{StaticResource MaterialDesignTreeViewItemFocusVisual}"/>
<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type TreeView}}}"/>
<Setter Property="wpf:TreeViewAssist.ExpanderSize" Value="16"/>
<Setter Property="wpf:TreeViewAssist.ShowSelection" Value="True"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TreeViewItem}">
Expand All @@ -177,7 +180,7 @@
<RowDefinition/>
</Grid.RowDefinitions>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup Name="CommonStates">
<VisualStateGroup Name="CommonStates" >
<VisualStateGroup.Transitions>
<VisualTransition GeneratedDuration="0:0:0.3" To="Normal">
<VisualTransition.GeneratedEasingFunction>
Expand All @@ -200,7 +203,7 @@
<VisualStateGroup.Transitions>
<VisualTransition GeneratedDuration="0:0:0.6"/>
</VisualStateGroup.Transitions>
<VisualState Name="Selected">
<VisualState Name="Selected" >
<Storyboard>
<DoubleAnimation Storyboard.TargetName="SelectedBorder"
Storyboard.TargetProperty="Opacity"
Expand Down Expand Up @@ -261,8 +264,9 @@
Style="{StaticResource MaterialDesignExpandCollapseToggleStyle}"
Foreground="{TemplateBinding Foreground}"
Margin="8 0 8 0"
VerticalAlignment="Center"
/>
Width="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
Height="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
VerticalAlignment="Center"/>

<Border x:Name="MouseOverBorder"
Grid.Column="1" Grid.ColumnSpan="2"
Expand All @@ -278,6 +282,7 @@

<Grid Grid.Column="1" Grid.ColumnSpan="2" x:Name="ContentGrid" Background="{TemplateBinding Background}">
<wpf:Ripple Feedback="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
x:Name="Ripple"
Focusable="False"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Expand Down Expand Up @@ -326,6 +331,11 @@
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" Value=".56"/>
</Trigger>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.ShowSelection)}" Value="False">
<Setter TargetName="MouseOverBorder" Property="Visibility" Value="Collapsed"/>
<Setter TargetName="SelectedBorder" Property="Visibility" Value="Collapsed"/>
<Setter TargetName="Ripple" Property="Feedback" Value="Transparent"/>
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
Expand Down
36 changes: 36 additions & 0 deletions MaterialDesignThemes.Wpf/TreeViewAssist.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace MaterialDesignThemes.Wpf
{
public static class TreeViewAssist
{
#region AdditionalTemplate
/// <summary>
/// Allows additional rendering for each tree node, outside of the rippled part of the node which responsds to user selection.
/// </summary>
Expand Down Expand Up @@ -44,6 +45,10 @@ public static DataTemplate GetAdditionalTemplate(DependencyObject element)
return (DataTemplate)element.GetValue(AdditionalTemplateProperty);
}

#endregion

#region AdditionalTemplateSelector

/// <summary>
/// Allows additional rendering for each tree node, outside of the rippled part of the node which responsds to user selection.
/// </summary>
Expand Down Expand Up @@ -79,6 +84,10 @@ public static DataTemplateSelector GetAdditionalTemplateSelector(DependencyObjec
return (DataTemplateSelector)element.GetValue(AdditionalTemplateSelectorProperty);
}

#endregion

#region NoTemplate

private static readonly Lazy<DataTemplate> NoAdditionalTemplateProvider = new Lazy<DataTemplate>(CreateEmptyGridDataTemplate);

/// <summary>
Expand All @@ -99,5 +108,32 @@ public static DataTemplate CreateEmptyGridDataTemplate()
return (DataTemplate)XamlReader.Load(memoryStream, parserContext);
}
}

#endregion

#region ExpanderSize

public static double GetExpanderSize(DependencyObject element)
=> (double)element.GetValue(ExpanderSizeProperty);
public static void SetExpanderSize(DependencyObject element, double value)
=> element.SetValue(ExpanderSizeProperty, value);

public static readonly DependencyProperty ExpanderSizeProperty =
DependencyProperty.RegisterAttached("ExpanderSize", typeof(double), typeof(TreeViewAssist), new PropertyMetadata(default(double)));

#endregion

#region ShowSelection

public static bool GetShowSelection(DependencyObject element)
=> (bool)element.GetValue(ExpanderSizeProperty);
public static void SetShowSelection(DependencyObject element, bool value)
=> element.SetValue(ExpanderSizeProperty, value);

public static readonly DependencyProperty ShowSelectionProperty =
DependencyProperty.RegisterAttached("ShowSelection", typeof(bool), typeof(TreeViewAssist), new PropertyMetadata(true));

#endregion

}
}