SPARK-429 Grid filters: select from domain filter should use checkboxes

This commit is contained in:
John Colvin committed 2018-02-07 16:19:08 -05:00
1 parent 0a18fba52d
commit e5fbb7a8df
3 files changed
+52 -22

No files matched your search

@@ -36,10 +36,10 @@
<c:TimeFilterControl TimeFilter="{Binding time_filter}"/>
</DataTemplate>
<DataTemplate x:Key="DiscreteValuesTemplate">
<c:ListBoxEx ItemsSource="{Binding items}" Selection="{Binding selected_items}" SelectionMode="Extended" ItemContainerStyle="{StaticResource ListBoxItemCheckBoxStyle}"/>
<c:ListBoxEx ItemsSource="{Binding items}" Selection="{Binding selected_items}" SelectionMode="Multiple" ItemContainerStyle="{StaticResource ListBoxItemCheckBoxStyle}"/>
</DataTemplate>
<DataTemplate x:Key="EnumValuesTemplate">
<c:ListBoxEx ItemsSource="{Binding items}" Selection="{Binding selected_items}" SelectionMode="Extended" ItemContainerStyle="{StaticResource ListBoxItemCheckBoxStyle}" ItemTemplate="{StaticResource EnumDescriptionTemplate}"/>
<c:ListBoxEx ItemsSource="{Binding items}" Selection="{Binding selected_items}" SelectionMode="Multiple" ItemContainerStyle="{StaticResource ListBoxItemCheckBoxStyle}" ItemTemplate="{StaticResource EnumDescriptionTemplate}"/>
</DataTemplate>
<DataTemplate x:Key="RegexFinder">
<StackPanel Orientation="Horizontal">
@@ -35,19 +35,35 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Path Fill="{StaticResource OptionMark.Static.Glyph}" Stretch="None" Visibility="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsSelectedCheckmarkVisibilityConverter}}"
Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z "/>
<ContentPresenter Grid.Column="1" Margin="3,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
<Border x:Name="checkBoxBorder" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Background="{StaticResource OptionMark.Static.Background}" BorderBrush="{StaticResource OptionMark.Static.Border}" BorderThickness="1">
<Path x:Name="optionMark" Fill="{StaticResource OptionMark.Static.Glyph}" Stretch="None"
Visibility="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsSelectedCheckmarkVisibilityConverter}}"
Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z "/>
</Border>
<ContentPresenter Grid.Column="1" Margin="3,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Grid>
</Border>
<ControlTemplate.Triggers>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsMouseOver" Value="True"/>
</MultiTrigger.Conditions>
<Setter Property="Background" TargetName="Bd" Value="{StaticResource MS.Item.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource MS.Item.MouseOver.Border}"/>
</MultiTrigger>
<Trigger Property="IsMouseOver" Value="True">
<Trigger.Setters>
<Setter Property="Background" TargetName="Bd" Value="{StaticResource MS.Item.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource MS.Item.MouseOver.Border}"/>
<Setter Property="Background" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.MouseOver.Border}"/>
<Setter Property="Fill" TargetName="optionMark" Value="{StaticResource OptionMark.MouseOver.Glyph}"/>
</Trigger.Setters>
</Trigger>
<EventTrigger RoutedEvent="MouseLeftButtonDown">
<EventTrigger.Actions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="checkBoxBorder" Storyboard.TargetProperty="Background.Color" To="{StaticResource OptionMark.Pressed.Background.Color}" Duration="0:00:00"/>
<ColorAnimation Storyboard.TargetName="checkBoxBorder" Storyboard.TargetProperty="BorderBrush.Color" To="{StaticResource OptionMark.Pressed.Border.Color}" Duration="0:00:00"/>
</Storyboard>
</BeginStoryboard>
</EventTrigger.Actions>
</EventTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="Selector.IsSelectionActive" Value="False"/>
@@ -66,6 +82,9 @@
</MultiTrigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
<Setter Property="Background" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Disabled.Background}"/>
<Setter Property="BorderBrush" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Disabled.Border}"/>
<Setter Property="Fill" TargetName="optionMark" Value="{StaticResource OptionMark.Disabled.Glyph}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
+21 -10
View File
@@ -2,6 +2,17 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="clr-namespace:mbts.ui"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<Color x:Key="OptionMark.MouseOver.Background.Color">#FFF3F9FF</Color>
<Color x:Key="OptionMark.MouseOver.Border.Color">#FF5593FF</Color>
<Color x:Key="OptionMark.MouseOver.Glyph.Color">#FF212121</Color>
<Color x:Key="OptionMark.Disabled.Background.Color">#FFE6E6E6</Color>
<Color x:Key="OptionMark.Disabled.Border.Color">#FFBCBCBC</Color>
<Color x:Key="OptionMark.Disabled.Glyph.Color">#FF707070</Color>
<Color x:Key="OptionMark.Pressed.Background.Color">#FFD9ECFF</Color>
<Color x:Key="OptionMark.Pressed.Border.Color">#FF3C77DD</Color>
<Color x:Key="OptionMark.Pressed.Glyph.Color">#FF212121</Color>
<Color x:Key="OptionMark.Static.Glyph.Color">#FF212121</Color>
<LinearGradientBrush x:Key="Item.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#FFECF4FC" Offset="0.0"/>
<GradientStop Color="#FFDCECFC" Offset="1.0"/>
@@ -40,16 +51,16 @@
</Setter.Value>
</Setter>
</Style>
<SolidColorBrush x:Key="OptionMark.MouseOver.Background" Color="#FFF3F9FF"/>
<SolidColorBrush x:Key="OptionMark.MouseOver.Border" Color="#FF5593FF"/>
<SolidColorBrush x:Key="OptionMark.MouseOver.Glyph" Color="#FF212121"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Background" Color="#FFE6E6E6"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Border" Color="#FFBCBCBC"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Glyph" Color="#FF707070"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Background" Color="#FFD9ECFF"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Border" Color="#FF3C77DD"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Glyph" Color="#FF212121"/>
<SolidColorBrush x:Key="OptionMark.Static.Glyph" Color="#FF212121"/>
<SolidColorBrush x:Key="OptionMark.MouseOver.Background" Color="{StaticResource OptionMark.MouseOver.Background.Color}"/>
<SolidColorBrush x:Key="OptionMark.MouseOver.Border" Color="{StaticResource OptionMark.MouseOver.Border.Color}"/>
<SolidColorBrush x:Key="OptionMark.MouseOver.Glyph" Color="{StaticResource OptionMark.MouseOver.Glyph.Color}"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Background" Color="{StaticResource OptionMark.Disabled.Background.Color}"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Border" Color="{StaticResource OptionMark.Disabled.Border.Color}"/>
<SolidColorBrush x:Key="OptionMark.Disabled.Glyph" Color="{StaticResource OptionMark.Disabled.Glyph.Color}"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Background" Color="{StaticResource OptionMark.Pressed.Background.Color}"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Border" Color="{StaticResource OptionMark.Pressed.Border.Color}"/>
<SolidColorBrush x:Key="OptionMark.Pressed.Glyph" Color="{StaticResource OptionMark.Pressed.Glyph.Color}"/>
<SolidColorBrush x:Key="OptionMark.Static.Glyph" Color="{StaticResource OptionMark.Static.Glyph.Color}"/>
<x:ArrayExtension x:Key="TrueFalseItems" Type="sys:Boolean">
<u:TrueExtension />