Skip to content

Commit 2c0ba13

Browse files
authored
Set foreground for cells (#1830)
Fixes #1816 We no longer change the foreground on mouse over.
1 parent f6d3334 commit 2c0ba13

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
<Setter Property="Background" Value="Transparent"/>
210210
<Setter Property="BorderBrush" Value="Transparent"/>
211211
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
212+
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
212213
<Setter Property="Template">
213214
<Setter.Value>
214215
<ControlTemplate TargetType="{x:Type DataGridCell}">
@@ -230,17 +231,7 @@
230231
<MultiDataTrigger.Conditions>
231232
<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True"/>
232233
<Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
233-
<Condition Binding="{Binding (Selector.IsSelectionActive), RelativeSource={RelativeSource Self}}" Value="False"/>
234234
</MultiDataTrigger.Conditions>
235-
<Setter Property="Background" Value="{DynamicResource MaterialDesignSelection}"/>
236-
</MultiDataTrigger>
237-
<MultiDataTrigger>
238-
<MultiDataTrigger.Conditions>
239-
<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True"/>
240-
<Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
241-
<Condition Binding="{Binding (Selector.IsSelectionActive), RelativeSource={RelativeSource Self}}" Value="True"/>
242-
</MultiDataTrigger.Conditions>
243-
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
244235
<Setter Property="Background" Value="{DynamicResource MaterialDesignSelection}" />
245236
</MultiDataTrigger>
246237
<Trigger Property="IsEnabled" Value="False">

0 commit comments

Comments
 (0)