Skip to content

Commit b0a295e

Browse files
drpetersonfernandesdrpetersonfernandes
committed
**Refactor: introduce ThemedDataGridColumnHeaderStyle and update DataGrid headers**
- Define new named style in App.xaml for consistent theming - Apply BasedOn to all DataGridColumnHeader styles in MainWindow.xaml
1 parent bdc0a0c commit b0a295e

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

‎BatchConvertToCHD/App.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,16 @@
419419
</Setter>
420420
</Style>
421421

422+
<Style x:Key="ThemedDataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
423+
<Setter Property="Background" Value="{StaticResource HeaderBackgroundBrush}"/>
424+
<Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
425+
<Setter Property="FontWeight" Value="SemiBold"/>
426+
<Setter Property="Padding" Value="10,8"/>
427+
<Setter Property="BorderThickness" Value="0,0,1,1"/>
428+
<Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
429+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
430+
</Style>
431+
422432
<!-- ==================== NAMED STYLES ==================== -->
423433

424434
<!-- Primary Action Button Style -->

‎BatchConvertToCHD/MainWindow.xaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,21 @@
121121
<DataGrid.Columns>
122122
<DataGridCheckBoxColumn Header="Select" Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" Width="80">
123123
<DataGridCheckBoxColumn.HeaderStyle>
124-
<Style TargetType="DataGridColumnHeader">
124+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
125125
<Setter Property="ToolTip" Value="Check or uncheck to select files for processing" />
126126
</Style>
127127
</DataGridCheckBoxColumn.HeaderStyle>
128128
</DataGridCheckBoxColumn>
129129
<DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="*" IsReadOnly="True">
130130
<DataGridTextColumn.HeaderStyle>
131-
<Style TargetType="DataGridColumnHeader">
131+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
132132
<Setter Property="ToolTip" Value="Name of the file" />
133133
</Style>
134134
</DataGridTextColumn.HeaderStyle>
135135
</DataGridTextColumn>
136136
<DataGridTextColumn Header="Size" Binding="{Binding DisplaySize}" Width="130" IsReadOnly="True">
137137
<DataGridTextColumn.HeaderStyle>
138-
<Style TargetType="DataGridColumnHeader">
138+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
139139
<Setter Property="ToolTip" Value="File size" />
140140
</Style>
141141
</DataGridTextColumn.HeaderStyle>
@@ -189,21 +189,21 @@
189189
<DataGrid.Columns>
190190
<DataGridCheckBoxColumn Header="Select" Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" Width="80">
191191
<DataGridCheckBoxColumn.HeaderStyle>
192-
<Style TargetType="DataGridColumnHeader">
192+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
193193
<Setter Property="ToolTip" Value="Check or uncheck to select files for processing" />
194194
</Style>
195195
</DataGridCheckBoxColumn.HeaderStyle>
196196
</DataGridCheckBoxColumn>
197197
<DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="*" IsReadOnly="True">
198198
<DataGridTextColumn.HeaderStyle>
199-
<Style TargetType="DataGridColumnHeader">
199+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
200200
<Setter Property="ToolTip" Value="Name of the file" />
201201
</Style>
202202
</DataGridTextColumn.HeaderStyle>
203203
</DataGridTextColumn>
204204
<DataGridTextColumn Header="Size" Binding="{Binding DisplaySize}" Width="130" IsReadOnly="True">
205205
<DataGridTextColumn.HeaderStyle>
206-
<Style TargetType="DataGridColumnHeader">
206+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
207207
<Setter Property="ToolTip" Value="File size" />
208208
</Style>
209209
</DataGridTextColumn.HeaderStyle>
@@ -290,21 +290,21 @@
290290
<DataGrid.Columns>
291291
<DataGridCheckBoxColumn Header="Select" Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" Width="80">
292292
<DataGridCheckBoxColumn.HeaderStyle>
293-
<Style TargetType="DataGridColumnHeader">
293+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
294294
<Setter Property="ToolTip" Value="Check or uncheck to select files for processing" />
295295
</Style>
296296
</DataGridCheckBoxColumn.HeaderStyle>
297297
</DataGridCheckBoxColumn>
298298
<DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="*" IsReadOnly="True">
299299
<DataGridTextColumn.HeaderStyle>
300-
<Style TargetType="DataGridColumnHeader">
300+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
301301
<Setter Property="ToolTip" Value="Name of the file" />
302302
</Style>
303303
</DataGridTextColumn.HeaderStyle>
304304
</DataGridTextColumn>
305305
<DataGridTextColumn Header="Size" Binding="{Binding DisplaySize}" Width="130" IsReadOnly="True">
306306
<DataGridTextColumn.HeaderStyle>
307-
<Style TargetType="DataGridColumnHeader">
307+
<Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource ThemedDataGridColumnHeaderStyle}">
308308
<Setter Property="ToolTip" Value="File size" />
309309
</Style>
310310
</DataGridTextColumn.HeaderStyle>

0 commit comments

Comments
 (0)