整理代码
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:assists="clr-namespace:Melskin.Assists"
|
||||
xmlns:controls="clr-namespace:Melskin.Controls"
|
||||
xmlns:decorations="clr-namespace:Melskin.Controls.Decorations"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
xmlns:decorations="clr-namespace:Melskin.Controls.Decorations">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="/Melskin;component/Themes/Animations.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<Style TargetType="{x:Type controls:AccordionItem}" x:Key="EmbossAccordionItemStyle">
|
||||
<Style x:Key="EmbossAccordionItemStyle" TargetType="{x:Type controls:AccordionItem}">
|
||||
<Setter Property="VerticalAlignment" Value="Top" />
|
||||
<Setter Property="Background" Value="{DynamicResource ControlBackgroundNormalBrush}" />
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderNormalBrush}" />
|
||||
@@ -16,29 +16,29 @@
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type controls:AccordionItem}">
|
||||
<Border
|
||||
Padding="{TemplateBinding Padding}"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
Padding="{TemplateBinding Padding}"
|
||||
SnapsToDevicePixels="true">
|
||||
<StackPanel>
|
||||
<!--<ToggleButton Style="{DynamicResource ExpanderDownHeaderStyle}" />-->
|
||||
<ToggleButton
|
||||
x:Name="HeaderButton"
|
||||
Padding="6"
|
||||
Background="{TemplateBinding Background}"
|
||||
Content="{TemplateBinding Header}"
|
||||
ContentTemplate="{TemplateBinding HeaderTemplate}"
|
||||
Cursor="Hand"
|
||||
FontWeight="Bold"
|
||||
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
|
||||
Padding="6"
|
||||
x:Name="HeaderButton">
|
||||
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
|
||||
<ToggleButton.Template>
|
||||
<ControlTemplate TargetType="ToggleButton">
|
||||
<Border
|
||||
Padding="{TemplateBinding Padding}"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
BorderThickness="{TemplateBinding BorderThickness}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
@@ -46,14 +46,14 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
|
||||
<controls:IconElement
|
||||
x:Name="arrow"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
FontSize="24"
|
||||
FontWeight="Regular"
|
||||
Foreground="{DynamicResource TextPrimaryBrush}"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
Symbol="KeyboardArrowDown"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowDown">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
@@ -81,23 +81,23 @@
|
||||
</ToggleButton.Template>
|
||||
</ToggleButton>
|
||||
<Rectangle
|
||||
Fill="{DynamicResource BorderNormalBrush}"
|
||||
x:Name="Divider"
|
||||
Height="1"
|
||||
Margin="-4,0"
|
||||
x:Name="Divider" />
|
||||
Fill="{DynamicResource BorderNormalBrush}" />
|
||||
<Border
|
||||
x:Name="ContentSiteWrapper"
|
||||
ClipToBounds="True"
|
||||
RenderTransformOrigin="0.5,0"
|
||||
Visibility="Collapsed"
|
||||
x:Name="ContentSiteWrapper">
|
||||
Visibility="Collapsed">
|
||||
<Border.RenderTransform>
|
||||
<ScaleTransform ScaleY="0" />
|
||||
</Border.RenderTransform>
|
||||
<ContentPresenter
|
||||
x:Name="ContentSite"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
|
||||
x:Name="ContentSite" />
|
||||
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
@@ -112,11 +112,11 @@
|
||||
</ObjectAnimationUsingKeyFrames>
|
||||
<!-- 步骤2: 播放展开动画 -->
|
||||
<DoubleAnimation
|
||||
Duration="0:0:0.3"
|
||||
From="0"
|
||||
Storyboard.TargetName="ContentSiteWrapper"
|
||||
Storyboard.TargetProperty="RenderTransform.ScaleY"
|
||||
To="1">
|
||||
From="0"
|
||||
To="1"
|
||||
Duration="0:0:0.3">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseOut" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
@@ -129,11 +129,11 @@
|
||||
<Storyboard>
|
||||
<!-- 步骤1: 播放折叠动画 -->
|
||||
<DoubleAnimation
|
||||
Duration="0:0:0.3"
|
||||
From="1"
|
||||
Storyboard.TargetName="ContentSiteWrapper"
|
||||
Storyboard.TargetProperty="RenderTransform.ScaleY"
|
||||
To="0">
|
||||
From="1"
|
||||
To="0"
|
||||
Duration="0:0:0.3">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseIn" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
@@ -152,7 +152,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="{x:Type controls:Accordion}" x:Key="EmbossAccordionStyle">
|
||||
<Style x:Key="EmbossAccordionStyle" TargetType="{x:Type controls:Accordion}">
|
||||
<Setter Property="ItemContainerStyle" Value="{StaticResource EmbossAccordionItemStyle}" />
|
||||
<Setter Property="ItemsPanel">
|
||||
<Setter.Value>
|
||||
@@ -175,7 +175,7 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style TargetType="{x:Type controls:AccordionItem}" x:Key="AccordionItemStyle">
|
||||
<Style x:Key="AccordionItemStyle" TargetType="{x:Type controls:AccordionItem}">
|
||||
<Setter Property="VerticalAlignment" Value="Top" />
|
||||
<Setter Property="Background" Value="{DynamicResource ControlBackgroundNormalBrush}" />
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderNormalBrush}" />
|
||||
@@ -183,28 +183,28 @@
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type controls:AccordionItem}">
|
||||
<Border
|
||||
Padding="{TemplateBinding Padding}"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
Padding="{TemplateBinding Padding}"
|
||||
SnapsToDevicePixels="true">
|
||||
<StackPanel>
|
||||
<ToggleButton
|
||||
x:Name="HeaderButton"
|
||||
Padding="6"
|
||||
Background="{TemplateBinding Background}"
|
||||
Content="{TemplateBinding Header}"
|
||||
ContentTemplate="{TemplateBinding HeaderTemplate}"
|
||||
Cursor="Hand"
|
||||
FontWeight="Bold"
|
||||
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
|
||||
Padding="6"
|
||||
x:Name="HeaderButton">
|
||||
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
|
||||
<ToggleButton.Template>
|
||||
<ControlTemplate TargetType="ToggleButton">
|
||||
<Border
|
||||
Padding="{TemplateBinding Padding}"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
BorderThickness="{TemplateBinding BorderThickness}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
@@ -212,14 +212,14 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
|
||||
<controls:IconElement
|
||||
x:Name="arrow"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
FontSize="24"
|
||||
FontWeight="Regular"
|
||||
Foreground="{DynamicResource TextPrimaryBrush}"
|
||||
Grid.Column="1"
|
||||
Padding="-6"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
Symbol="KeyboardArrowDown"
|
||||
x:Name="arrow">
|
||||
Symbol="KeyboardArrowDown">
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:IconElement.RenderTransform>
|
||||
@@ -240,22 +240,22 @@
|
||||
</ToggleButton.Template>
|
||||
</ToggleButton>
|
||||
<Rectangle
|
||||
Fill="{DynamicResource BorderNormalBrush}"
|
||||
x:Name="Divider"
|
||||
Height="1"
|
||||
x:Name="Divider" />
|
||||
Fill="{DynamicResource BorderNormalBrush}" />
|
||||
<Border
|
||||
x:Name="ContentSiteWrapper"
|
||||
ClipToBounds="True"
|
||||
RenderTransformOrigin="0.5,0"
|
||||
Visibility="Collapsed"
|
||||
x:Name="ContentSiteWrapper">
|
||||
Visibility="Collapsed">
|
||||
<Border.RenderTransform>
|
||||
<ScaleTransform ScaleY="0" />
|
||||
</Border.RenderTransform>
|
||||
<ContentPresenter
|
||||
x:Name="ContentSite"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
|
||||
x:Name="ContentSite" />
|
||||
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
@@ -270,11 +270,11 @@
|
||||
</ObjectAnimationUsingKeyFrames>
|
||||
<!-- 步骤2: 播放展开动画 -->
|
||||
<DoubleAnimation
|
||||
Duration="0:0:0.3"
|
||||
From="0"
|
||||
Storyboard.TargetName="ContentSiteWrapper"
|
||||
Storyboard.TargetProperty="RenderTransform.ScaleY"
|
||||
To="1">
|
||||
From="0"
|
||||
To="1"
|
||||
Duration="0:0:0.3">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseOut" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
@@ -287,11 +287,11 @@
|
||||
<Storyboard>
|
||||
<!-- 步骤1: 播放折叠动画 -->
|
||||
<DoubleAnimation
|
||||
Duration="0:0:0.3"
|
||||
From="1"
|
||||
Storyboard.TargetName="ContentSiteWrapper"
|
||||
Storyboard.TargetProperty="RenderTransform.ScaleY"
|
||||
To="0">
|
||||
From="1"
|
||||
To="0"
|
||||
Duration="0:0:0.3">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseIn" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
@@ -334,11 +334,11 @@
|
||||
<VisualBrush.Visual>
|
||||
<!-- 定义遮罩形状:黑色代表可见区域,圆角与外部一致 -->
|
||||
<Border
|
||||
Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=Border}}"
|
||||
Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=Border}}"
|
||||
Background="Black"
|
||||
CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource AncestorType=Border}}"
|
||||
Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=Border}}"
|
||||
SnapsToDevicePixels="True"
|
||||
Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=Border}}" />
|
||||
SnapsToDevicePixels="True" />
|
||||
</VisualBrush.Visual>
|
||||
</VisualBrush>
|
||||
</Border.OpacityMask>
|
||||
|
||||
Reference in New Issue
Block a user