整理代码

2026-02-20 15:31:44 +08:00
parent 94cf3f3266
commit 9f121cfc7f
149 changed files with 4063 additions and 6964 deletions
--- a/Melskin/Controls/Decorations/EmbossBorder.xaml
+++ b/Melskin/Controls/Decorations/EmbossBorder.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:cvt="clr-namespace:Melskin.Converters"
    xmlns:decorations="clr-namespace:Melskin.Controls.Decorations"
-    xmlns:internal="clr-namespace:Melskin.Converters.Internal"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:internal="clr-namespace:Melskin.Converters.Internal">

    <Style TargetType="{x:Type decorations:EmbossBorder}">
        <Setter Property="Focusable" Value="False" />
@@ -27,17 +27,17 @@
                        <Grid Margin="4" Visibility="{TemplateBinding ShaderEnabled, Converter={x:Static cvt:BooleanToVisibilityConverter.CollapsedInstance}}">
                            <!--  暗部  -->
                            <Border
-                                Background="{TemplateBinding DarkShadowBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
+                                x:Name="DarkBorder"
                                Margin="{TemplateBinding Intensity,
                                                         Converter={x:Static internal:IntensityToEmbossMarginRightBottomConverter.Instance}}"
-                                x:Name="DarkBorder" />
+                                Background="{TemplateBinding DarkShadowBrush}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
                            <!--  亮部  -->
                            <Border
-                                Background="{TemplateBinding LightShadowBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
                                Margin="{TemplateBinding Intensity,
-                                                         Converter={x:Static internal:IntensityToEmbossMarginLeftTopConverter.Instance}}" />
+                                                         Converter={x:Static internal:IntensityToEmbossMarginLeftTopConverter.Instance}}"
+                                Background="{TemplateBinding LightShadowBrush}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
                            <!--  模糊效果  -->
                            <Grid.Effect>
                                <BlurEffect Radius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Intensity, Converter={x:Static internal:IntensityToEmbossBlurConverter.Instance}, Mode=OneWay}" />
@@ -47,20 +47,20 @@
                        <!--  内容区域  -->
                        <!--  默认4的边距显示光影效果  -->
                        <Border
+                            Margin="4"
+                            Padding="{TemplateBinding Padding}"
                            Background="{TemplateBinding Background}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Margin="4"
-                            Padding="{TemplateBinding Padding}">
+                            CornerRadius="{TemplateBinding CornerRadius}">
                            <ContentPresenter
-                                Focusable="False"
+                                x:Name="contentPresenter"
                                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>
                    </Grid>
                </ControlTemplate>
--- a/Melskin/Controls/Decorations/LightedSurface.xaml
+++ b/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">
--- a/Melskin/Controls/Decorations/SlotBorder.xaml
+++ b/Melskin/Controls/Decorations/SlotBorder.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:conv="clr-namespace:Melskin.Converters"
    xmlns:dec="clr-namespace:Melskin.Controls.Decorations"
-    xmlns:internal="clr-namespace:Melskin.Converters.Internal"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:internal="clr-namespace:Melskin.Converters.Internal">
    <Style TargetType="{x:Type dec:SlotBorder}">
        <Setter Property="Focusable" Value="False" />
        <Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />
@@ -26,31 +26,31 @@
                        <!--  隐藏阴影的时候呈现背景色  -->
                        <!--  默认4的边距显示光影效果  -->
                        <Border
+                            Margin="4"
                            Background="{TemplateBinding Background}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Margin="4" />
+                            CornerRadius="{TemplateBinding CornerRadius}" />
                        <!--  内阴影效果  -->
                        <Grid Visibility="{TemplateBinding ShaderEnabled, Converter={x:Static conv:BooleanToVisibilityConverter.CollapsedInstance}}">
                            <!--  背景填充  -->
                            <Rectangle Fill="{TemplateBinding Background}" />
                            <!--  左上阴影  -->
                            <Border
-                                Background="{TemplateBinding DarkShadowBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
                                Margin="{TemplateBinding Intensity,
-                                                         Converter={x:Static internal:IntensityToSlotShadowMarginConverter.Instance}}" />
+                                                         Converter={x:Static internal:IntensityToSlotShadowMarginConverter.Instance}}"
+                                Background="{TemplateBinding DarkShadowBrush}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
                            <!--  右下高亮  -->
                            <Border
-                                Background="{TemplateBinding LightShadowBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
                                Margin="{TemplateBinding Intensity,
-                                                         Converter={x:Static internal:IntensityToSlotLightMarginConverter.Instance}}" />
+                                                         Converter={x:Static internal:IntensityToSlotLightMarginConverter.Instance}}"
+                                Background="{TemplateBinding LightShadowBrush}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
                            <!--  背景中央  -->
                            <Border
-                                Background="{TemplateBinding Background}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
                                Margin="{TemplateBinding Intensity,
-                                                         Converter={x:Static internal:IntensityToSlotMarginConverter.Instance}}" />
+                                                         Converter={x:Static internal:IntensityToSlotMarginConverter.Instance}}"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
                            <!--  裁切区域  -->
                            <Grid.Clip>
                                <MultiBinding
@@ -78,19 +78,19 @@
                        <!--  显示边框和内容  -->
                        <!--  默认4的边距显示光影效果  -->
                        <Border
+                            Margin="4"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Margin="4">
+                            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>
                    </Grid>