Skip to content

Commit 259f12a

Browse files
MohammadHadi2031Keboo
MohammadHadi2031
authored and
Keboo
committed
fix style issues
1 parent f21fa24 commit 259f12a

File tree

3 files changed

+94
-30
lines changed

3 files changed

+94
-30
lines changed

‎src/MainDemo.Wpf/Trees.xaml‎

Lines changed: 89 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
</Grid.ColumnDefinitions>
3434

3535
<Grid.RowDefinitions>
36+
<RowDefinition Height="Auto" />
37+
<RowDefinition Height="Auto" MaxHeight="450" />
3638
<RowDefinition Height="Auto" />
3739
<RowDefinition Height="Auto" MaxHeight="450" />
3840
<RowDefinition Height="Auto" />
@@ -203,12 +205,15 @@
203205
</Grid>
204206
</smtx:XamlDisplay>
205207

206-
<TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="Multi-Select Tree View:"
207-
Grid.Column="2"/>
208-
<smtx:XamlDisplay Grid.Row="1"
209-
Grid.Column="2"
210-
VerticalContentAlignment="Top"
211-
UniqueKey="trees_3">
208+
<TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="Multi-Select Tree List View:"
209+
Grid.Row="2"
210+
Grid.Column="0"
211+
Margin="0,40,0,0"/>
212+
<smtx:XamlDisplay Grid.Row="3"
213+
Grid.Column="0"
214+
VerticalContentAlignment="Top"
215+
UniqueKey="trees_3"
216+
Margin="0,75,0,20">
212217
<Grid>
213218
<materialDesign:TreeListView MinWidth="220" MaxHeight="450"
214219
ItemsSource="{Binding TreeItems}"
@@ -244,46 +249,109 @@
244249
</Style>
245250
</materialDesign:TreeListView.ItemContainerStyle>
246251

247-
<!--<materialDesign:TreeListView.View>
252+
</materialDesign:TreeListView>
253+
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
254+
<Button Command="{Binding AddListTreeItemCommand}"
255+
ToolTip="Add an item"
256+
Content="{materialDesign:PackIcon Kind=Add}"/>
257+
258+
<Button Command="{Binding RemoveListTreeItemCommand}"
259+
ToolTip="Remove selected item(s)"
260+
Content="{materialDesign:PackIcon Kind=Remove}"/>
261+
262+
</StackPanel>
263+
</Grid>
264+
</smtx:XamlDisplay>
265+
266+
<TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}"
267+
Text="Multi-Select Tree Grid View:"
268+
Grid.Row="2"
269+
Grid.Column="1"
270+
Margin="0,40,0,0" />
271+
<smtx:XamlDisplay Grid.Row="3"
272+
Grid.Column="1"
273+
VerticalContentAlignment="Top"
274+
UniqueKey="trees_7"
275+
Margin="0,20,0,20">
276+
<Grid>
277+
<materialDesign:TreeListView MinWidth="220"
278+
MaxHeight="450"
279+
ItemsSource="{Binding TreeItems}"
280+
SelectedItem="{Binding SelectedTreeItem}">
281+
<materialDesign:TreeListView.Resources>
282+
<HierarchicalDataTemplate DataType="{x:Type domain:TestItem}"
283+
ItemsSource="{Binding Items, Mode=OneTime}">
284+
<TextBlock VerticalAlignment="Center"
285+
Text="{Binding Name, Mode=OneTime}" />
286+
</HierarchicalDataTemplate>
287+
288+
<HierarchicalDataTemplate DataType="{x:Type domain:MovieCategory}"
289+
ItemsSource="{Binding Movies, Mode=OneTime}">
290+
<TextBlock Margin="3,2"
291+
Text="{Binding Name, Mode=OneTime}" />
292+
</HierarchicalDataTemplate>
293+
294+
<DataTemplate DataType="{x:Type domain:Movie}">
295+
<TextBlock Margin="3,2"
296+
Text="{Binding Name, Mode=OneTime}"
297+
ToolTip="{Binding Director, Mode=OneTime}" />
298+
</DataTemplate>
299+
</materialDesign:TreeListView.Resources>
300+
301+
<materialDesign:TreeListView.ItemContainerStyle>
302+
<Style TargetType="materialDesign:TreeListViewItem"
303+
BasedOn="{StaticResource {x:Type materialDesign:TreeListViewItem}}">
304+
<Setter Property="IsExpanded"
305+
Value="{Binding IsExpanded}" />
306+
</Style>
307+
</materialDesign:TreeListView.ItemContainerStyle>
308+
309+
<materialDesign:TreeListView.View>
248310
<GridView>
249311
<GridView.Columns>
250-
<GridViewColumn Width="250" Header="Name">
312+
<GridViewColumn Width="250"
313+
Header="Name">
251314
<GridViewColumn.CellTemplate>
252315
<DataTemplate>
253-
<TextBlock VerticalAlignment="Center" Text="{Binding Name, Mode=OneTime}" />
316+
<TextBlock VerticalAlignment="Center"
317+
Text="{Binding Name, Mode=OneTime}" />
254318
</DataTemplate>
255319
</GridViewColumn.CellTemplate>
256320
</GridViewColumn>
257321

258-
<GridViewColumn Width="100" Header="Count">
322+
<GridViewColumn Width="100"
323+
Header="Count">
259324
<GridViewColumn.CellTemplate>
260325
<DataTemplate>
261-
<TextBlock VerticalAlignment="Center" Text="{Binding Items.Count, Mode=OneWay}" />
326+
<TextBlock VerticalAlignment="Center"
327+
Text="{Binding Items.Count, Mode=OneWay}" />
262328
</DataTemplate>
263329
</GridViewColumn.CellTemplate>
264330
</GridViewColumn>
265331
</GridView.Columns>
266332
</GridView>
267-
</materialDesign:TreeListView.View>-->
333+
</materialDesign:TreeListView.View>
268334
</materialDesign:TreeListView>
269-
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
335+
<StackPanel Orientation="Horizontal"
336+
VerticalAlignment="Bottom"
337+
HorizontalAlignment="Right">
270338
<Button Command="{Binding AddListTreeItemCommand}"
271339
ToolTip="Add an item"
272-
Content="{materialDesign:PackIcon Kind=Add}"/>
340+
Content="{materialDesign:PackIcon Kind=Add}" />
273341

274342
<Button Command="{Binding RemoveListTreeItemCommand}"
275343
ToolTip="Remove selected item(s)"
276-
Content="{materialDesign:PackIcon Kind=Remove}"/>
344+
Content="{materialDesign:PackIcon Kind=Remove}" />
277345

278346
</StackPanel>
279347
</Grid>
280348
</smtx:XamlDisplay>
281349

282-
<TextBlock Grid.Row="2"
350+
<TextBlock Grid.Row="4"
283351
Style="{StaticResource PageSectionTitleTextBlock}"
284352
Text="Additional node content, syntax 1" />
285353

286-
<smtx:XamlDisplay Grid.Row="3"
354+
<smtx:XamlDisplay Grid.Row="5"
287355
UniqueKey="trees_4">
288356
<TreeView>
289357
<materialDesign:TreeViewAssist.AdditionalTemplate>
@@ -326,13 +394,13 @@
326394
</TreeView>
327395
</smtx:XamlDisplay>
328396

329-
<TextBlock Grid.Row="2"
397+
<TextBlock Grid.Row="4"
330398
Grid.Column="1"
331399
Margin="32,0,0,0"
332400
Style="{StaticResource PageSectionTitleTextBlock}"
333401
Text="Additional node content, syntax 2" />
334402

335-
<smtx:XamlDisplay Grid.Row="3"
403+
<smtx:XamlDisplay Grid.Row="5"
336404
Grid.Column="1"
337405
Margin="32,0,0,0"
338406
UniqueKey="trees_5">
@@ -376,13 +444,13 @@
376444
</TreeView>
377445
</smtx:XamlDisplay>
378446

379-
<TextBlock Grid.Row="2"
447+
<TextBlock Grid.Row="4"
380448
Grid.Column="2"
381449
Margin="32,0,0,0"
382450
Style="{StaticResource PageSectionTitleTextBlock}"
383451
Text="Additional node content, showcase" />
384452

385-
<smtx:XamlDisplay Grid.Row="3"
453+
<smtx:XamlDisplay Grid.Row="5"
386454
Grid.Column="2"
387455
Margin="32,0,0,0"
388456
UniqueKey="trees_6">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=wpf:TreeListViewItem}}" />
1212
<Setter Property="Focusable" Value="False" />
1313
<Setter Property="Height" Value="16" />
14+
<Setter Property="Margin" Value="8,0,8,0" />
1415
<Setter Property="Template">
1516
<Setter.Value>
1617
<ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -178,7 +179,6 @@
178179
<ToggleButton x:Name="Expander"
179180
Width="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
180181
Height="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
181-
Margin="8,0,8,0"
182182
VerticalAlignment="Center"
183183
ClickMode="Press"
184184
Foreground="{TemplateBinding Foreground}"
@@ -216,7 +216,6 @@
216216
Visibility="Visible" />
217217

218218
<GridViewRowPresenter x:Name="PART_GridViewRowPresenterr"
219-
Margin="{TemplateBinding Padding}"
220219
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
221220
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
222221
Visibility="Collapsed" />

‎src/MaterialDesignThemes.Wpf/TreeListView.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,9 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
275275
{
276276
base.OnPropertyChanged(e);
277277

278-
if (e.Property == ViewProperty)
278+
if (e.Property == ViewProperty && View is GridView gridView)
279279
{
280-
if (View is GridView gridView)
281-
{
282-
AddToggleButtonToFirstColumn(gridView);
283-
}
280+
AddToggleButtonToFirstColumn(gridView);
284281
}
285282
}
286283

@@ -312,10 +309,10 @@ private DataTemplate CreateToggleButtonTemplate(DataTemplate originalTemplate)
312309
{
313310
RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(TreeListViewItem), 1)
314311
});
315-
stackPanelFactory.SetBinding(StackPanel.MarginProperty, marginMultiBinding);
312+
stackPanelFactory.SetBinding(MarginProperty, marginMultiBinding);
316313

317314
var toggleButtonFactory = new FrameworkElementFactory(typeof(ToggleButton));
318-
toggleButtonFactory.SetValue(ToggleButton.StyleProperty, Application.Current.Resources["MaterialDesignTreeListViewToggleButtonStyle"]);
315+
toggleButtonFactory.SetValue(StyleProperty, FindResource("MaterialDesignTreeListViewToggleButtonStyle"));
319316

320317
toggleButtonFactory.SetBinding(ToggleButton.IsCheckedProperty, new Binding(TreeListViewItem.IsExpandedProperty.Name)
321318
{

0 commit comments

Comments
 (0)