Skip to content

Commit 6d7b39a

Browse files
committed
[DevExpress] Add Fluent styles for TreeDataGrid
1 parent 182bf83 commit 6d7b39a

File tree

4 files changed

+342
-8
lines changed

4 files changed

+342
-8
lines changed

samples/SampleApp/App.axaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@
55
<Styles x:Key="LinuxYaruStyles">
66
<StyleInclude Source="avares://Devolutions.AvaloniaTheme.Linux/LinuxTheme.axaml" />
77
<StyleInclude Source="/Styles.axaml" />
8-
<!-- TODO: move into themes -->
9-
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
108
</Styles>
119
<Styles x:Key="DevExpressStyles">
1210
<StyleInclude Source="avares://Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml" />
1311
<StyleInclude Source="/Styles.axaml" />
14-
<!-- TODO: move into themes -->
15-
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
1612
</Styles>
1713
<Styles x:Key="MacOsStyles">
1814
<StyleInclude Source="avares://Devolutions.AvaloniaTheme.MacOS/MacOSTheme.axaml" />
1915
<StyleInclude Source="/Styles.axaml" />
20-
<!-- TODO: move into themes -->
21-
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
2216
</Styles>
2317
</Application.Resources>
2418

@@ -29,7 +23,5 @@
2923
<StyleInclude Source="avares://Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml" />
3024
<!-- <StyleInclude Source="avares://Devolutions.AvaloniaTheme.Linux/LinuxTheme.axaml" /> -->
3125
<StyleInclude Source="/Styles.axaml" />
32-
<!-- TODO: move into themes -->
33-
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
3426
</Application.Styles>
3527
</Application>

src/Devolutions.AvaloniaTheme.DevExpress/Accents/Styles.axaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,13 @@
3838
<Style Selector="DataGridRow:nth-child(even)">
3939
<Setter Property="Background" Value="{DynamicResource DataGridRowAlternatingBackgroundBrush}" />
4040
</Style>
41+
42+
<Style Selector=":is(TreeDataGridCell)">
43+
<Setter Property="Background" Value="Transparent" />
44+
<Setter Property="MinHeight" Value="25" />
45+
</Style>
46+
47+
<Style Selector=":is(TreeDataGridCell):selected">
48+
<Setter Property="Background" Value="{DynamicResource TreeDataGridSelectedCellBackgroundBrush}" />
49+
</Style>
4150
</Styles>

0 commit comments

Comments
 (0)