整理代码
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:controls="clr-namespace:Melskin.Controls"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="clr-namespace:Melskin.Controls">
|
||||
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="/Melskin;component/Themes/Animations.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<!-- 向下扩展 -->
|
||||
<Style TargetType="{x:Type ToggleButton}" x:Key="ExpanderDownHeaderStyle">
|
||||
<Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
@@ -24,20 +24,20 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<ContentPresenter
|
||||
Grid.Column="0"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="4,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
RecognizesAccessKey="True"
|
||||
SnapsToDevicePixels="True"
|
||||
VerticalAlignment="Center" />
|
||||
SnapsToDevicePixels="True" />
|
||||
<controls:IconElement
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
x:Name="arrow"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
SnapsToDevicePixels="False"
|
||||
Symbol="KeyboardArrowDown"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowDown">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
@@ -45,16 +45,16 @@
|
||||
|
||||
</Grid>
|
||||
<Border
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
x:Name="separate"
|
||||
Grid.Row="1"
|
||||
Height="1"
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed"
|
||||
x:Name="separate" />
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Visibility" TargetName="separate" Value="Visible" />
|
||||
<Setter TargetName="separate" Property="Visibility" Value="Visible" />
|
||||
<Trigger.EnterActions>
|
||||
<BeginStoryboard Storyboard="{StaticResource ExpandRotateStoryboard}" />
|
||||
</Trigger.EnterActions>
|
||||
@@ -63,13 +63,13 @@
|
||||
</Trigger.ExitActions>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource TextDisabledBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource TextDisabledBrush}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -77,7 +77,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
<!-- 向上扩展 -->
|
||||
<Style TargetType="{x:Type ToggleButton}" x:Key="ExpanderUpHeaderStyle">
|
||||
<Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
@@ -95,37 +95,37 @@
|
||||
<ColumnDefinition Width="20" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<controls:IconElement
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
x:Name="arrow"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
SnapsToDevicePixels="False"
|
||||
Symbol="KeyboardArrowUp"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowUp">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
</controls:IconElement>
|
||||
<ContentPresenter
|
||||
Grid.Column="0"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="4,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
RecognizesAccessKey="True"
|
||||
SnapsToDevicePixels="True"
|
||||
VerticalAlignment="Center" />
|
||||
SnapsToDevicePixels="True" />
|
||||
</Grid>
|
||||
<Border
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
x:Name="separate"
|
||||
Grid.Row="0"
|
||||
Height="1"
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed"
|
||||
x:Name="separate" />
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Visibility" TargetName="separate" Value="Visible" />
|
||||
<Setter TargetName="separate" Property="Visibility" Value="Visible" />
|
||||
<Trigger.EnterActions>
|
||||
<BeginStoryboard Storyboard="{StaticResource ExpandRotateStoryboard}" />
|
||||
</Trigger.EnterActions>
|
||||
@@ -134,13 +134,13 @@
|
||||
</Trigger.ExitActions>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource TextDisabledBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource TextDisabledBrush}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -148,7 +148,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
<!-- 向左扩展 -->
|
||||
<Style TargetType="{x:Type ToggleButton}" x:Key="ExpanderLeftHeaderStyle">
|
||||
<Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
@@ -166,13 +166,13 @@
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<controls:IconElement
|
||||
x:Name="arrow"
|
||||
Padding="-6"
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
Padding="-6"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
SnapsToDevicePixels="False"
|
||||
Symbol="KeyboardArrowLeft"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowLeft">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
@@ -180,27 +180,27 @@
|
||||
|
||||
<ContentPresenter
|
||||
Grid.Row="1"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,4,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
RecognizesAccessKey="True"
|
||||
SnapsToDevicePixels="True"
|
||||
VerticalAlignment="Top">
|
||||
SnapsToDevicePixels="True">
|
||||
<ContentPresenter.LayoutTransform>
|
||||
<RotateTransform Angle="90" />
|
||||
</ContentPresenter.LayoutTransform>
|
||||
</ContentPresenter>
|
||||
</Grid>
|
||||
<Border
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
x:Name="separate"
|
||||
Grid.Column="0"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed"
|
||||
Width="1"
|
||||
x:Name="separate" />
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Visibility" TargetName="separate" Value="Visible" />
|
||||
<Setter TargetName="separate" Property="Visibility" Value="Visible" />
|
||||
<Trigger.EnterActions>
|
||||
<BeginStoryboard Storyboard="{StaticResource ExpandRotateStoryboard}" />
|
||||
</Trigger.EnterActions>
|
||||
@@ -209,13 +209,13 @@
|
||||
</Trigger.ExitActions>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource TextDisabledBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource TextDisabledBrush}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -223,7 +223,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
<!-- 向右扩展 -->
|
||||
<Style TargetType="{x:Type ToggleButton}" x:Key="ExpanderRightHeaderStyle">
|
||||
<Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
@@ -241,13 +241,13 @@
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<controls:IconElement
|
||||
x:Name="arrow"
|
||||
Padding="-6"
|
||||
FontSize="28"
|
||||
Foreground="{DynamicResource TextSecondaryBrush}"
|
||||
Padding="-6"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
SnapsToDevicePixels="False"
|
||||
Symbol="KeyboardArrowRight"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowRight">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
@@ -255,27 +255,27 @@
|
||||
|
||||
<ContentPresenter
|
||||
Grid.Row="1"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,4,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
RecognizesAccessKey="True"
|
||||
SnapsToDevicePixels="True"
|
||||
VerticalAlignment="Top">
|
||||
SnapsToDevicePixels="True">
|
||||
<ContentPresenter.LayoutTransform>
|
||||
<RotateTransform Angle="-90" />
|
||||
</ContentPresenter.LayoutTransform>
|
||||
</ContentPresenter>
|
||||
</Grid>
|
||||
<Border
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
x:Name="separate"
|
||||
Grid.Column="1"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed"
|
||||
Width="1"
|
||||
x:Name="separate" />
|
||||
Background="{DynamicResource DividerBrush}"
|
||||
SnapsToDevicePixels="False"
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Visibility" TargetName="separate" Value="Visible" />
|
||||
<Setter TargetName="separate" Property="Visibility" Value="Visible" />
|
||||
<Trigger.EnterActions>
|
||||
<BeginStoryboard Storyboard="{StaticResource ExpandRotateStoryboard}" />
|
||||
</Trigger.EnterActions>
|
||||
@@ -284,13 +284,13 @@
|
||||
</Trigger.ExitActions>
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryHoverBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource PrimaryPressedBrush}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" TargetName="arrow" Value="{DynamicResource TextDisabledBrush}" />
|
||||
<Setter TargetName="arrow" Property="Foreground" Value="{DynamicResource TextDisabledBrush}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -320,6 +320,10 @@
|
||||
SnapsToDevicePixels="True">
|
||||
<DockPanel>
|
||||
<ToggleButton
|
||||
x:Name="HeaderSite"
|
||||
Padding="6"
|
||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
Content="{TemplateBinding Header}"
|
||||
ContentTemplate="{TemplateBinding HeaderTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
|
||||
@@ -331,46 +335,42 @@
|
||||
FontStyle="{TemplateBinding FontStyle}"
|
||||
FontWeight="{TemplateBinding FontWeight}"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Padding="6"
|
||||
Style="{StaticResource ExpanderDownHeaderStyle}"
|
||||
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
x:Name="HeaderSite" />
|
||||
Style="{StaticResource ExpanderDownHeaderStyle}" />
|
||||
<ContentPresenter
|
||||
x:Name="ExpandSite"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
DockPanel.Dock="Bottom"
|
||||
Focusable="False"
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
Visibility="Collapsed"
|
||||
x:Name="ExpandSite" />
|
||||
Visibility="Collapsed" />
|
||||
</DockPanel>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsExpanded" Value="True">
|
||||
<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
|
||||
<Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
|
||||
</Trigger>
|
||||
<Trigger Property="ExpandDirection" Value="Right">
|
||||
<Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right" />
|
||||
<Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left" />
|
||||
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}" />
|
||||
<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
|
||||
<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Left" />
|
||||
<Setter TargetName="HeaderSite" Property="Style" Value="{StaticResource ExpanderRightHeaderStyle}" />
|
||||
<!-- 靠左 -->
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||
</Trigger>
|
||||
<Trigger Property="ExpandDirection" Value="Up">
|
||||
<Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top" />
|
||||
<Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom" />
|
||||
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}" />
|
||||
<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
|
||||
<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Bottom" />
|
||||
<Setter TargetName="HeaderSite" Property="Style" Value="{StaticResource ExpanderUpHeaderStyle}" />
|
||||
<!-- 靠下 -->
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="VerticalAlignment" Value="Bottom" />
|
||||
</Trigger>
|
||||
<Trigger Property="ExpandDirection" Value="Left">
|
||||
<Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left" />
|
||||
<Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right" />
|
||||
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}" />
|
||||
<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
|
||||
<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Right" />
|
||||
<Setter TargetName="HeaderSite" Property="Style" Value="{StaticResource ExpanderLeftHeaderStyle}" />
|
||||
<!-- 靠右 -->
|
||||
<Setter Property="HorizontalAlignment" Value="Right" />
|
||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
||||
|
||||
Reference in New Issue
Block a user