|
@@ -989,7 +989,7 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
.AddBinding(new Binding(sColName))));
|
|
|
}
|
|
|
|
|
|
- private void ApplyFilterStyle(GridColumn column, bool filtering, bool isactioncolumn)
|
|
|
+ private void ApplyFilterStyle(GridColumn column, bool filtering, bool allowSorting)
|
|
|
{
|
|
|
var filterstyle = new Style();
|
|
|
if (filtering)
|
|
@@ -1000,7 +1000,7 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
column.FilterRowCondition = FilterRowCondition.Contains;
|
|
|
column.FilterRowOptionsVisibility = Visibility.Collapsed;
|
|
|
column.AllowBlankFilters = true;
|
|
|
- column.AllowSorting = !isactioncolumn && Parent.CanSort();
|
|
|
+ column.AllowSorting = allowSorting && Parent.CanSort();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1155,7 +1155,7 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
newcol.HeaderText = column.HeaderText;
|
|
|
newcol.AllowEditing = false;
|
|
|
|
|
|
- ApplyFilterStyle(newcol, true, true);
|
|
|
+ ApplyFilterStyle(newcol, true, false);
|
|
|
|
|
|
newcol.ShowToolTip = column.ToolTip != null;
|
|
|
newcol.ShowHeaderToolTip = column.ToolTip != null;
|
|
@@ -1193,10 +1193,7 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
newcol.ShowToolTip = column.ToolTip != null;
|
|
|
newcol.ShowHeaderToolTip = column.ToolTip != null;
|
|
|
|
|
|
- var style = new Style();
|
|
|
- style.Setters.Add(new Setter(Control.BackgroundProperty, new SolidColorBrush(Colors.Gainsboro)));
|
|
|
- style.Setters.Add(new Setter(Control.IsEnabledProperty, false));
|
|
|
- newcol.FilterRowCellStyle = style;
|
|
|
+ ApplyFilterStyle(newcol, true, true);
|
|
|
|
|
|
newcol.HeaderStyle = GetHeaderCellStyle(column);
|
|
|
|
|
@@ -1280,7 +1277,7 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
Summaries.Add(summary);
|
|
|
}
|
|
|
|
|
|
- ApplyFilterStyle(newColumn, newcol.Filtered, false);
|
|
|
+ ApplyFilterStyle(newColumn, newcol.Filtered, true);
|
|
|
|
|
|
newColumn.HeaderStyle = GetHeaderCellStyle(column);
|
|
|
|