Skip to content

Commit cd38cea

Browse files
committed
feat: enhance DataGrid UI for a more modern look
1 parent 98b8f2e commit cd38cea

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

src/Wpf.Ui/Controls/DataGrid/DataGrid.xaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@
128128
<Style x:Key="DefaultDataGridCellStyle" TargetType="{x:Type DataGridCell}">
129129
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
130130
<Setter Property="VerticalContentAlignment" Value="Stretch" />
131+
<Setter Property="VerticalAlignment" Value="Center" />
132+
<Setter Property="Padding" Value="6,0,6,0" />
131133
<Setter Property="MinHeight" Value="32" />
132134
<Setter Property="IsTabStop" Value="False" />
133135
<Setter Property="OverridesDefaultStyle" Value="True" />
@@ -138,6 +140,7 @@
138140
x:Name="Border"
139141
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
140142
VerticalAlignment="{TemplateBinding VerticalAlignment}"
143+
Padding="{TemplateBinding Padding}"
141144
Background="Transparent"
142145
BorderBrush="Transparent"
143146
BorderThickness="0"
@@ -394,7 +397,7 @@
394397
<!-- Style and template for the DataGridRowHeader. -->
395398
<Style x:Key="DefaultDataGridRowHeaderStyle" TargetType="{x:Type DataGridRowHeader}">
396399
<Setter Property="Background" Value="Transparent" />
397-
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
400+
<Setter Property="BorderBrush" Value="Transparent" />
398401
<Setter Property="OverridesDefaultStyle" Value="True" />
399402
<Setter Property="Template">
400403
<Setter.Value>
@@ -490,16 +493,17 @@
490493
<Setter Property="SeparatorBrush" Value="{DynamicResource ControlFillColorDefault}" />
491494
<Setter Property="IsTabStop" Value="False" />
492495
<Setter Property="OverridesDefaultStyle" Value="True" />
496+
<Setter Property="FontWeight" Value="Bold" />
493497
<Setter Property="Template">
494498
<Setter.Value>
495499
<ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
496500
<Grid>
497501
<Border
498502
x:Name="columnHeaderBorder"
499-
Padding="3,0,3,0"
503+
Padding="7,1,7,0"
500504
Background="{TemplateBinding Background}"
501505
BorderBrush="{TemplateBinding BorderBrush}"
502-
BorderThickness="0,0,1,1">
506+
BorderThickness="0,0,0,3">
503507
<ContentPresenter
504508
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
505509
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -515,6 +519,13 @@
515519
HorizontalAlignment="Right"
516520
Style="{StaticResource ColumnHeaderGripperStyle}" />
517521
</Grid>
522+
<ControlTemplate.Triggers>
523+
<Trigger Property="IsMouseOver" Value="True">
524+
<Setter TargetName="columnHeaderBorder" Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
525+
<Setter TargetName="columnHeaderBorder" Property="Padding" Value="6, 0, 6, 0" />
526+
<Setter TargetName="columnHeaderBorder" Property="BorderThickness" Value="1,1,1,3" />
527+
</Trigger>
528+
</ControlTemplate.Triggers>
518529
</ControlTemplate>
519530
</Setter.Value>
520531
</Setter>
@@ -660,6 +671,7 @@
660671
<Setter Property="ColumnHeaderStyle" Value="{StaticResource DefaultDataGridColumnHeaderStyle}" />
661672
<Setter Property="DragIndicatorStyle" Value="{StaticResource DefaultDragIndicatorStyleStyle}" />
662673
<Setter Property="OverridesDefaultStyle" Value="True" />
674+
<Setter Property="GridLinesVisibility" Value="Horizontal" />
663675
<Setter Property="Template">
664676
<Setter.Value>
665677
<ControlTemplate TargetType="{x:Type DataGrid}">

0 commit comments

Comments
 (0)