File tree Expand file tree Collapse file tree 1 file changed +34
-5
lines changed
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid Expand file tree Collapse file tree 1 file changed +34
-5
lines changed Original file line number Diff line number Diff line change @@ -1122,11 +1122,40 @@ internal void EnsureForeground()
1122
1122
{
1123
1123
DiagnosticsDebug . Assert ( this . Index != - 1 , "Expected Index other than -1." ) ;
1124
1124
1125
- var newForeground = this . Index % 2 == 0 || this . OwningGrid . AlternatingRowForeground == null
1126
- ? this . OwningGrid . RowForeground
1127
- : this . OwningGrid . AlternatingRowForeground ;
1125
+ PropertyMetadata metadataInfo = DataGridRow . ForegroundProperty . GetMetadata ( typeof ( DataGridRow ) ) ;
1126
+ Brush defaultForeground = metadataInfo == null ? null : metadataInfo . DefaultValue as Brush ;
1127
+ Brush newForeground = null ;
1128
1128
1129
- this . ComputedForeground = newForeground ?? this . Foreground ;
1129
+ if ( this . Foreground . Equals ( defaultForeground ) )
1130
+ {
1131
+ if ( this . Index % 2 == 0 || this . OwningGrid . AlternatingRowForeground == null )
1132
+ {
1133
+ // Use OwningGrid.RowForeground if the index is even or if the OwningGrid.AlternatingRowForeground is null
1134
+ if ( this . OwningGrid . RowForeground != null )
1135
+ {
1136
+ newForeground = this . OwningGrid . RowForeground ;
1137
+ }
1138
+ }
1139
+ else
1140
+ {
1141
+ // Alternate row
1142
+ if ( this . OwningGrid . AlternatingRowForeground != null )
1143
+ {
1144
+ newForeground = this . OwningGrid . AlternatingRowForeground ;
1145
+ }
1146
+ }
1147
+
1148
+ if ( newForeground == null )
1149
+ {
1150
+ newForeground = this . Foreground ;
1151
+ }
1152
+ }
1153
+ else
1154
+ {
1155
+ newForeground = this . Foreground ;
1156
+ }
1157
+
1158
+ this . ComputedForeground = newForeground ;
1130
1159
}
1131
1160
else
1132
1161
{
@@ -1502,4 +1531,4 @@ public int Debug_Index
1502
1531
}
1503
1532
#endif
1504
1533
}
1505
- }
1534
+ }
You can’t perform that action at this time.
0 commit comments