整理代码

Melskin/Controls/ToggleButton.xaml

@@ -1,10 +1,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:assist="clr-namespace:Melskin.Assists"
-    xmlns:decorations="clr-namespace:Melskin.Controls.Decorations"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:decorations="clr-namespace:Melskin.Controls.Decorations">
 
-    <Style TargetType="{x:Type ToggleButton}" x:Key="EmbossToggleButtonStyle">
+    <Style x:Key="EmbossToggleButtonStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}" />
         <Setter Property="Background" Value="{DynamicResource BackgroundLayoutBrush}" />
         <!--<Setter Property="BorderBrush" Value="{DynamicResource BackgroundLayoutBrush}" />-->
@@ -18,54 +18,54 @@
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Grid>
                         <decorations:EmbossBorder
+                            x:Name="emboss"
+                            Margin="0"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Intensity="0.6"
-                            Margin="0"
-                            ShaderEnabled="True"
-                            x:Name="emboss" />
+                            ShaderEnabled="True" />
                         <decorations:SlotBorder
+                            x:Name="slot"
+                            Margin="0"
                             Background="{TemplateBinding Background}"
                             Intensity="0"
-                            Margin="0"
-                            ShaderEnabled="False"
-                            x:Name="slot">
+                            ShaderEnabled="False">
                             <ContentPresenter
-                                Focusable="False"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                x:Name="contentPresenter"
                                 Margin="{TemplateBinding Padding}"
-                                RecognizesAccessKey="True"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                x:Name="contentPresenter" />
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </decorations:SlotBorder>
                     </Grid>
                     <ControlTemplate.Triggers>
 
                         <Trigger Property="Button.IsDefaulted" Value="True" />
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="ShaderEnabled" TargetName="slot" Value="True" />
+                            <Setter TargetName="slot" Property="ShaderEnabled" Value="True" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource PrimaryGradientBrush}" />
-                            <Setter Property="ShaderEnabled" TargetName="emboss" Value="False" />
-                            <Setter Property="Intensity" TargetName="slot" Value="0.9" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource PrimaryGradientBrush}" />
+                            <Setter TargetName="emboss" Property="ShaderEnabled" Value="False" />
+                            <Setter TargetName="slot" Property="Intensity" Value="0.9" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource PrimaryGradientBrush}" />
-                            <Setter Property="Visibility" TargetName="emboss" Value="Collapsed" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource PrimaryGradientBrush}" />
+                            <Setter TargetName="emboss" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsPressed" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Intensity" TargetName="slot" Value="0.6" />
-                            <Setter Property="ShaderEnabled" TargetName="slot" Value="True" />
+                            <Setter TargetName="slot" Property="Intensity" Value="0.6" />
+                            <Setter TargetName="slot" Property="ShaderEnabled" Value="True" />
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" TargetName="emboss" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
-                            <Setter Property="Background" TargetName="slot" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextDisabledBrush}" />
+                            <Setter TargetName="emboss" Property="Background" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
+                            <Setter TargetName="slot" Property="Background" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextDisabledBrush}" />
                         </Trigger>
 
                     </ControlTemplate.Triggers>
@@ -73,7 +73,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="{x:Type ToggleButton}" x:Key="DefaultToggleButtonStyle">
+    <Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundNormalBrush}" />
         <Setter Property="BorderBrush" Value="Transparent" />
@@ -87,20 +87,20 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border
+                        x:Name="Border"
+                        Margin="0"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding assist:ControlAssist.CornerRadius}"
-                        Margin="0"
-                        x:Name="Border">
+                        CornerRadius="{TemplateBinding assist:ControlAssist.CornerRadius}">
                         <ContentPresenter
-                            Focusable="False"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            x:Name="contentPresenter"
                             Margin="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            x:Name="contentPresenter" />
+                            Focusable="False"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Button.IsDefaulted" Value="True" />
@@ -108,11 +108,11 @@
                             <Setter Property="Background" Value="{DynamicResource ControlBackgroundHoverBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextPrimaryBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextPrimaryBrush}" />
                             <Setter Property="Background" Value="{DynamicResource ControlBackgroundPressedBrush}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextAccentBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextAccentBrush}" />
                             <Setter Property="Background" Value="{DynamicResource PrimaryFocusedBrush}" />
                         </Trigger>
                         <MultiTrigger>
@@ -125,7 +125,7 @@
 
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Background" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextDisabledBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextDisabledBrush}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -133,7 +133,7 @@
                                 <Condition Property="IsEnabled" Value="False" />
                             </MultiTrigger.Conditions>
                             <Setter Property="Background" Value="{DynamicResource PrimaryDisabledBrush}" />
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextDisabledBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextDisabledBrush}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -142,7 +142,7 @@
     </Style>
 
     <!--  工具栏按钮  -->
-    <Style TargetType="{x:Type ToggleButton}" x:Key="{x:Static ToolBar.ToggleButtonStyleKey}">
+    <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" TargetType="{x:Type ToggleButton}">
         <Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource BorderNormalBrush}" />
@@ -156,34 +156,34 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border
+                        x:Name="border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="4"
-                        x:Name="border">
+                        CornerRadius="4">
                         <ContentPresenter
-                            Focusable="False"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            x:Name="contentPresenter"
                             Margin="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            x:Name="contentPresenter" />
+                            Focusable="False"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource ControlBackgroundSelectedBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource ControlBackgroundSelectedBrush}" />
                         </Trigger>
                         <Trigger Property="Button.IsDefaulted" Value="True" />
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource ControlBackgroundHoverBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource ControlBackgroundHoverBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource ControlBackgroundPressedBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource ControlBackgroundPressedBrush}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" TargetName="border" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
-                            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource TextDisabledBrush}" />
+                            <Setter TargetName="border" Property="Background" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
+                            <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextDisabledBrush}" />
                         </Trigger>
 
                     </ControlTemplate.Triggers>