整理代码

Melskin/Controls/Decorations/LightedSurface.xaml

@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:decorations="clr-namespace:Melskin.Controls.Decorations"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:decorations="clr-namespace:Melskin.Controls.Decorations">
 
     <Style TargetType="{x:Type decorations:LightedSurface}">
         <Setter Property="Focusable" Value="False" />
@@ -19,32 +19,32 @@
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="ShowLight">
                             <DoubleAnimation
-                                Duration="0:0:0.2"
                                 Storyboard.TargetProperty="LightIntensity"
-                                To="1" />
+                                To="1"
+                                Duration="0:0:0.2" />
                         </Storyboard>
                         <Storyboard x:Key="HideLight">
                             <DoubleAnimation
-                                Duration="0:0:0.2"
                                 Storyboard.TargetProperty="LightIntensity"
-                                To="0" />
+                                To="0"
+                                Duration="0:0:0.2" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Border
+                        x:Name="PART_lightBorder"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        x:Name="PART_lightBorder">
+                        CornerRadius="{TemplateBinding CornerRadius}">
                         <ContentPresenter
-                            Focusable="False"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            x:Name="contentPresenter"
                             Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Focusable="False"
                             RecognizesAccessKey="True"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            x:Name="contentPresenter" />
+                            TextElement.Foreground="{TemplateBinding Foreground}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">