|
@@ -725,20 +725,34 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
new Binding()
|
|
|
{
|
|
|
Path = new PropertyPath("."), Converter = CellBackgroundConverter,
|
|
|
- ConverterParameter = column
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
}));
|
|
|
cellstyle.Setters.Add(new Setter(Control.ForegroundProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellForegroundConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellForegroundConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontSizeProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontSizeConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontSizeConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontStyleProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontStyleConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontStyleConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontWeightProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontWeightConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontWeightConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
newcol.CellStyle = cellstyle;
|
|
|
|
|
|
DataGrid.Columns.Add(newcol);
|
|
@@ -854,13 +868,21 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
if (prop.Editor is null || !prop.Editor.Editable.IsDirectEditable())
|
|
|
{
|
|
|
cellstyle.Setters.Add(new Setter(Control.BackgroundProperty,
|
|
|
- new SolidColorBrush(Colors.WhiteSmoke)));
|
|
|
+ new Binding()
|
|
|
+ {
|
|
|
+ Path = new PropertyPath("."), Converter = CellBackgroundConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,new SolidColorBrush(Colors.WhiteSmoke))
|
|
|
+ }));
|
|
|
newColumn.AllowEditing = false;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
cellstyle.Setters.Add(new Setter(Control.BackgroundProperty,
|
|
|
- new SolidColorBrush(Colors.LightYellow)));
|
|
|
+ new Binding()
|
|
|
+ {
|
|
|
+ Path = new PropertyPath("."), Converter = CellBackgroundConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,new SolidColorBrush(Colors.LightYellow))
|
|
|
+ }));
|
|
|
newColumn.AllowEditing = true;
|
|
|
}
|
|
|
|
|
@@ -873,20 +895,32 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
new Binding()
|
|
|
{
|
|
|
Path = new PropertyPath("."), Converter = CellBackgroundConverter,
|
|
|
- ConverterParameter = column
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
}));
|
|
|
cellstyle.Setters.Add(new Setter(Control.ForegroundProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellForegroundConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellForegroundConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontSizeProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontSizeConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontSizeConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontStyleProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontStyleConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontStyleConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
cellstyle.Setters.Add(new Setter(Control.FontWeightProperty,
|
|
|
new Binding()
|
|
|
- { Converter = CellFontWeightConverter, ConverterParameter = column }));
|
|
|
+ {
|
|
|
+ Converter = CellFontWeightConverter,
|
|
|
+ ConverterParameter = new DynamicGridCellStyleParameters(column,DependencyProperty.UnsetValue)
|
|
|
+ }));
|
|
|
newColumn.CellStyle = cellstyle;
|
|
|
}
|
|
|
|