|
128 | 128 | <Style x:Key="DefaultDataGridCellStyle" TargetType="{x:Type DataGridCell}">
|
129 | 129 | <Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
130 | 130 | <Setter Property="VerticalContentAlignment" Value="Stretch" />
|
| 131 | + <Setter Property="VerticalAlignment" Value="Center" /> |
| 132 | + <Setter Property="Padding" Value="6,0,6,0" /> |
131 | 133 | <Setter Property="MinHeight" Value="32" />
|
132 | 134 | <Setter Property="IsTabStop" Value="False" />
|
133 | 135 | <Setter Property="OverridesDefaultStyle" Value="True" />
|
|
138 | 140 | x:Name="Border"
|
139 | 141 | HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
|
140 | 142 | VerticalAlignment="{TemplateBinding VerticalAlignment}"
|
| 143 | + Padding="{TemplateBinding Padding}" |
141 | 144 | Background="Transparent"
|
142 | 145 | BorderBrush="Transparent"
|
143 | 146 | BorderThickness="0"
|
|
394 | 397 | <!-- Style and template for the DataGridRowHeader. -->
|
395 | 398 | <Style x:Key="DefaultDataGridRowHeaderStyle" TargetType="{x:Type DataGridRowHeader}">
|
396 | 399 | <Setter Property="Background" Value="Transparent" />
|
397 |
| - <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" /> |
| 400 | + <Setter Property="BorderBrush" Value="Transparent" /> |
398 | 401 | <Setter Property="OverridesDefaultStyle" Value="True" />
|
399 | 402 | <Setter Property="Template">
|
400 | 403 | <Setter.Value>
|
|
490 | 493 | <Setter Property="SeparatorBrush" Value="{DynamicResource ControlFillColorDefault}" />
|
491 | 494 | <Setter Property="IsTabStop" Value="False" />
|
492 | 495 | <Setter Property="OverridesDefaultStyle" Value="True" />
|
| 496 | + <Setter Property="FontWeight" Value="Bold" /> |
493 | 497 | <Setter Property="Template">
|
494 | 498 | <Setter.Value>
|
495 | 499 | <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
|
496 | 500 | <Grid>
|
497 | 501 | <Border
|
498 | 502 | x:Name="columnHeaderBorder"
|
499 |
| - Padding="3,0,3,0" |
| 503 | + Padding="7,1,7,0" |
500 | 504 | Background="{TemplateBinding Background}"
|
501 | 505 | BorderBrush="{TemplateBinding BorderBrush}"
|
502 |
| - BorderThickness="0,0,1,1"> |
| 506 | + BorderThickness="0,0,0,3"> |
503 | 507 | <ContentPresenter
|
504 | 508 | HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
505 | 509 | VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
|
515 | 519 | HorizontalAlignment="Right"
|
516 | 520 | Style="{StaticResource ColumnHeaderGripperStyle}" />
|
517 | 521 | </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> |
518 | 529 | </ControlTemplate>
|
519 | 530 | </Setter.Value>
|
520 | 531 | </Setter>
|
|
660 | 671 | <Setter Property="ColumnHeaderStyle" Value="{StaticResource DefaultDataGridColumnHeaderStyle}" />
|
661 | 672 | <Setter Property="DragIndicatorStyle" Value="{StaticResource DefaultDragIndicatorStyleStyle}" />
|
662 | 673 | <Setter Property="OverridesDefaultStyle" Value="True" />
|
| 674 | + <Setter Property="GridLinesVisibility" Value="Horizontal" /> |
663 | 675 | <Setter Property="Template">
|
664 | 676 | <Setter.Value>
|
665 | 677 | <ControlTemplate TargetType="{x:Type DataGrid}">
|
|
0 commit comments