Bug (?) in DataGrid Foreground when enabled/disabled.

I find that when the DataGrid is enabled or disabled the proper foreground does not necessarily flow down to the cells. I am using WpfElements nightly build from about 8/22/2013. With the first demo (below) the cell foregrounds get stuck with the disabled foreground. In the second demo the cell foregrounds get stuck with the enabled foregrounds. I think this is caused by the cell foregrounds being set in DataGridRow.RestoreState from the column foregrounds, so that the normal inheritance of the Foreground property is disrupted. When I comment out the following lines in DataGrid.cs:

    //if (column.Foreground == null && IsLoaded)
    //{
    //    column.Foreground = Foreground;
    //}

and replace the following line in DataGridRow.cs

    //cell.Foreground = (cellModel.Column == null) ? Brushes.Black : cellModel.Column.Foreground;

with

    if (cellModel.Column != null && cellModel.Column.Foreground != null)
    {
        cell.Foreground = cellModel.Column.Foreground;
    }

it seems to solve this problem. This way, unless the foreground is explicitly overridden by the column the normal inheritance of the foreground should occur. However, I don't know if this might screw something else up.

Here is the XAML for the first demo:

<Window x:Class="DataGridTest7.MainWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ms="http://namespaces.mindscape.co.nz/wpf"
    Title="MainWindow" Height="350" Width="525">
<DockPanel>
    <CheckBox DockPanel.Dock="Top" x:Name="chkEnable" Margin="4" Content="Enable DataGrid"/>
    <TabControl x:Name="tabs" IsEnabled="{Binding ElementName=chkEnable,Path=IsChecked}">
        <TabItem Header="Tab A">
            <TextBlock Text="Nothing on this tab"/>
        </TabItem>
        <TabItem Header="Tab B">
            <ms:DataGrid x:Name="dataGrid">
                <ms:DataGrid.Columns>
                    <ms:DataGridColumn PropertyName="FirstName"/>
                    <ms:DataGridColumn PropertyName="LastName"/>
                    <ms:DataGridColumn PropertyName="Address"/>
                </ms:DataGrid.Columns>
            </ms:DataGrid>
        </TabItem>
    </TabControl>
</DockPanel>

Here is the XAML for the second demo:

<Window x:Class="DataGridTest7.MainWindow" 
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ms="http://namespaces.mindscape.co.nz/wpf"
    Title="MainWindow" Height="350" Width="525">
<DockPanel>
    <CheckBox DockPanel.Dock="Top" x:Name="chkEnable" Margin="4" Content="Enable DataGrid"/>
    <ms:DataGrid x:Name="dataGrid"  IsEnabled="{Binding ElementName=chkEnable,Path=IsChecked}">
        <ms:DataGrid.Columns>
            <ms:DataGridColumn PropertyName="FirstName"/>
            <ms:DataGridColumn PropertyName="LastName"/>
            <ms:DataGridColumn PropertyName="Address"/>
        </ms:DataGrid.Columns>
    </ms:DataGrid>
</DockPanel>

Here is the code behind for both:

public partial class MainWindow : Window
{
    public MainWindow()
    {
        InitializeComponent();

        Person[] persons = new Person[]
        {
            new Person() { FirstName = "John", LastName = "Smith", Address = "1 Main Street, South Park, CO" },
            new Person() { FirstName = "Mary", LastName = "Jones", Address = "2 Main Street, South Park, CO" },
            new Person() { FirstName = "Larry", LastName = "Black", Address = "3 Main Street, South Park, CO" },
        };
        dataGrid.ItemsSource = persons;
    }
}

public class Person
{
    public string FirstName { get; set; }
    public string LastName { get; set; }
    public string Address { get; set; }
}

}

Thanks Peter

I've tried out your fix and haven't come across any issues, so this will be available in the next nightly build.

Jason Fauchelle