DIYGrid ColumnHeaders don't hide HeaderContent behind filter/sort icons

This commit is contained in:
John Colvin committed 2019-08-14 00:24:35 -05:00
1 parent eb3c64a5be
commit b32c836f34
1 file changed
-4
@@ -245,14 +245,12 @@
</Trigger>
<!--Filter Active-->
<DataTrigger Binding="{Binding Path='Column.(bts:DataGridFilterProperties.FilterActive)', RelativeSource={RelativeSource Self}}" Value="True">
<Setter TargetName="HeaderContent" Property="Panel.ZIndex" Value="0"/>
<Setter TargetName="HeaderContent" Property="Margin" Value="0,0,11,0"/>
<Setter TargetName="FilterPopupImage" Property="Source" Value="{x:Static mbts:Icons.FilterActive}"/>
<Setter TargetName="FilterPopupImage" Property="Opacity" Value="1.0"/>
<Setter Property="Grid.Column" TargetName="SortArrow" Value="0"/>
</DataTrigger>
<DataTrigger Binding="{Binding Path='Column.(bts:DataGridFilterProperties.FilterActive)', RelativeSource={RelativeSource Self}}" Value="{x:Null}">
<Setter TargetName="HeaderContent" Property="Panel.ZIndex" Value="0"/>
<Setter TargetName="HeaderContent" Property="Margin" Value="0,0,11,0"/>
<Setter TargetName="FilterPopupImage" Property="Source" Value="{x:Static mbts:Icons.FilterError}"/>
<Setter TargetName="FilterPopupImage" Property="Opacity" Value="1.0"/>
@@ -260,7 +258,6 @@
</DataTrigger>
<!--Sort Active-->
<DataTrigger Binding="{Binding Column.SortDirection, RelativeSource={RelativeSource Self}}" Value="Ascending">
<Setter TargetName="HeaderContent" Property="Panel.ZIndex" Value="0"/>
<Setter TargetName="HeaderContent" Property="Margin" Value="0,0,11,0"/>
<Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
<Setter TargetName="SortArrow" Property="RenderTransform">
@@ -270,7 +267,6 @@
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding Column.SortDirection, RelativeSource={RelativeSource Self}}" Value="Descending">
<Setter TargetName="HeaderContent" Property="Panel.ZIndex" Value="0"/>
<Setter TargetName="HeaderContent" Property="Margin" Value="0,0,11,0"/>
<Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
</DataTrigger>