Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix selection with SelectionUnit=CellOrRowHeader #1452

Merged
merged 1 commit into from
Jun 28, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions MahApps.Metro/Styles/Controls.DataGrid.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,18 @@
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush}" />
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Self}}"
Value="True" />
<Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
Value="False" />
<Condition Binding="{Binding Path=SelectionUnit, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Value="CellOrRowHeader" />
</MultiDataTrigger.Conditions>
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush}" />
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
Expand All @@ -353,6 +365,18 @@
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush3}" />
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
Value="True" />
<Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
Value="False" />
<Condition Binding="{Binding Path=SelectionUnit, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Value="CellOrRowHeader" />
</MultiDataTrigger.Conditions>
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush3}" />
</MultiDataTrigger>
<Trigger Property="IsEnabled"
Value="False">
<Setter Property="Foreground"
Expand All @@ -375,8 +399,6 @@
<!-- Don't set the MinHeight or Height property, use the MinRowHeight or RowHeight property on DataGrid style! -->
<Style x:Key="MetroDataGridRow"
TargetType="{x:Type DataGridRow}">
<Setter Property="Background"
Value="{DynamicResource WhiteBrush}" />
<Setter Property="Foreground"
Value="{DynamicResource BlackBrush}" />
<Setter Property="Margin"
Expand All @@ -389,6 +411,16 @@
<Setter Property="Foreground"
Value="{DynamicResource AccentSelectedColorBrush}" />
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected"
Value="True" />
<Condition Property="Selector.IsSelectionActive"
Value="True" />
</MultiTrigger.Conditions>
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush2}" />
</MultiTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
Expand All @@ -399,16 +431,18 @@
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush3}" />
</MultiDataTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected"
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
Value="True" />
<Condition Property="Selector.IsSelectionActive"
<Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Self}}"
Value="True" />
</MultiTrigger.Conditions>
<Condition Binding="{Binding Path=SelectionUnit, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
Value="CellOrRowHeader" />
</MultiDataTrigger.Conditions>
<Setter Property="Background"
Value="{DynamicResource AccentColorBrush2}" />
</MultiTrigger>
Value="{DynamicResource AccentColorBrush3}" />
</MultiDataTrigger>
<Trigger Property="IsEnabled"
Value="False">
<Setter Property="Foreground"
Expand Down Expand Up @@ -661,4 +695,4 @@
</Style.Triggers>
</Style>

</ResourceDictionary>
</ResourceDictionary>