|
@@ -149,16 +149,16 @@
|
|
<MultiTrigger.Conditions>
|
|
<MultiTrigger.Conditions>
|
|
<Condition Property="UIElement.IsMouseOver" Value="True" />
|
|
<Condition Property="UIElement.IsMouseOver" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Panel.Background" Value="#1A000000" />
|
|
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A000000" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.hov.bg}" />
|
|
|
|
+ <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A000000" />-->
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<MultiTrigger>
|
|
<MultiTrigger>
|
|
<MultiTrigger.Conditions>
|
|
<MultiTrigger.Conditions>
|
|
<Condition Property="Selector.IsSelectionActive" Value="False" />
|
|
<Condition Property="Selector.IsSelectionActive" Value="False" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
|
|
|
|
+ <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />-->
|
|
<!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
|
|
<!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<MultiTrigger>
|
|
<MultiTrigger>
|
|
@@ -166,8 +166,8 @@
|
|
<Condition Property="Selector.IsSelectionActive" Value="True" />
|
|
<Condition Property="Selector.IsSelectionActive" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
|
|
|
|
+ <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />-->
|
|
<!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
|
|
<!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<Trigger Property="UIElement.IsEnabled" Value="False">
|
|
<Trigger Property="UIElement.IsEnabled" Value="False">
|
|
@@ -224,6 +224,7 @@
|
|
Background="{TemplateBinding Panel.Background}"
|
|
Background="{TemplateBinding Panel.Background}"
|
|
BorderBrush="{TemplateBinding Border.BorderBrush}"
|
|
BorderBrush="{TemplateBinding Border.BorderBrush}"
|
|
BorderThickness="{TemplateBinding Border.BorderThickness}"
|
|
BorderThickness="{TemplateBinding Border.BorderThickness}"
|
|
|
|
+ CornerRadius="{StaticResource border-radius.8}"
|
|
SnapsToDevicePixels="True">
|
|
SnapsToDevicePixels="True">
|
|
<Grid>
|
|
<Grid>
|
|
<ContentPresenter
|
|
<ContentPresenter
|
|
@@ -260,8 +261,8 @@
|
|
<Condition Property="Selector.IsSelected" Value="False" />
|
|
<Condition Property="Selector.IsSelected" Value="False" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
<!--<Setter Property="Panel.Background" TargetName="Bd" Value="#1A000000" />-->
|
|
<!--<Setter Property="Panel.Background" TargetName="Bd" Value="#1A000000" />-->
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#FF477EDE" />
|
|
|
|
- <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Visible" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Border.Background" Value="{StaticResource color.item-state.hov.bg}" />
|
|
|
|
+ <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<MultiTrigger>
|
|
<MultiTrigger>
|
|
@@ -269,9 +270,9 @@
|
|
<Condition Property="Selector.IsSelectionActive" Value="False" />
|
|
<Condition Property="Selector.IsSelectionActive" Value="False" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
|
|
|
|
+ <Setter TargetName="Bd" Property="Border.BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
|
|
|
|
+ <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<MultiTrigger>
|
|
<MultiTrigger>
|
|
@@ -279,9 +280,9 @@
|
|
<Condition Property="Selector.IsSelectionActive" Value="True" />
|
|
<Condition Property="Selector.IsSelectionActive" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
<Condition Property="Selector.IsSelected" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
|
|
|
|
- <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
|
|
|
|
+ <Setter TargetName="Bd" Property="Border.BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
|
|
|
|
+ <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
<Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|
|
<Trigger Property="UIElement.IsEnabled" Value="False">
|
|
<Trigger Property="UIElement.IsEnabled" Value="False">
|
|
@@ -343,10 +344,10 @@
|
|
<ControlTemplate TargetType="{x:Type ListViewItem}">
|
|
<ControlTemplate TargetType="{x:Type ListViewItem}">
|
|
<Border
|
|
<Border
|
|
Name="Bd"
|
|
Name="Bd"
|
|
- CornerRadius="4"
|
|
|
|
- BorderThickness="1"
|
|
|
|
Background="{TemplateBinding Panel.Background}"
|
|
Background="{TemplateBinding Panel.Background}"
|
|
BorderBrush="{TemplateBinding Border.BorderBrush}"
|
|
BorderBrush="{TemplateBinding Border.BorderBrush}"
|
|
|
|
+ BorderThickness="1"
|
|
|
|
+ CornerRadius="4"
|
|
SnapsToDevicePixels="True">
|
|
SnapsToDevicePixels="True">
|
|
<ContentPresenter
|
|
<ContentPresenter
|
|
Margin="0"
|
|
Margin="0"
|
|
@@ -401,8 +402,8 @@
|
|
<ControlTemplate x:Key="AnnotationListItemStyle" TargetType="{x:Type ListBoxItem}">
|
|
<ControlTemplate x:Key="AnnotationListItemStyle" TargetType="{x:Type ListBoxItem}">
|
|
<Border
|
|
<Border
|
|
x:Name="Bd"
|
|
x:Name="Bd"
|
|
- Padding="8"
|
|
|
|
Margin="5"
|
|
Margin="5"
|
|
|
|
+ Padding="8"
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
Background="{StaticResource color.sys.layout.mg}"
|
|
BorderBrush="{TemplateBinding BorderBrush}"
|
|
BorderBrush="{TemplateBinding BorderBrush}"
|
|
BorderThickness="{TemplateBinding BorderThickness}"
|
|
BorderThickness="{TemplateBinding BorderThickness}"
|
|
@@ -421,7 +422,7 @@
|
|
<MultiTrigger.Conditions>
|
|
<MultiTrigger.Conditions>
|
|
<Condition Property="IsMouseOver" Value="True" />
|
|
<Condition Property="IsMouseOver" Value="True" />
|
|
</MultiTrigger.Conditions>
|
|
</MultiTrigger.Conditions>
|
|
- <Setter TargetName="Bd" Property="Background" Value="{ StaticResource color.item-state.hov.bg}" />
|
|
|
|
|
|
+ <Setter TargetName="Bd" Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
|
|
<Setter TargetName="Bd" Property="BorderBrush" Value="Transparent" />
|
|
<Setter TargetName="Bd" Property="BorderBrush" Value="Transparent" />
|
|
<!--<Setter Property="Margin" Value="5,0,5,10" />-->
|
|
<!--<Setter Property="Margin" Value="5,0,5,10" />-->
|
|
</MultiTrigger>
|
|
</MultiTrigger>
|