整理代码

This commit is contained in:
GG Z
2026-02-20 15:31:44 +08:00
parent 94cf3f3266
commit 9f121cfc7f
149 changed files with 4063 additions and 6964 deletions

View File

@@ -1,16 +1,16 @@
<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 Source="/Melskin;component/Controls/IconElement.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style TargetType="{x:Type controls:Tag}" x:Key="TagBaseStyle">
<Style x:Key="TagBaseStyle" TargetType="{x:Type controls:Tag}">
<Setter Property="IsTabStop" Value="False" />
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -32,28 +32,28 @@
</Setter>
</Style>
<Style
x:Key="EmbossTag"
BasedOn="{StaticResource TagBaseStyle}"
TargetType="{x:Type controls:Tag}"
x:Key="EmbossTag">
TargetType="{x:Type controls:Tag}">
<Setter Property="Padding" Value="8,2" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:Tag}">
<decorations:EmbossBorder
x:Name="Effect"
Margin="-4"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
CornerRadius="{TemplateBinding assists:ControlAssist.CornerRadius}"
Focusable="False"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="-4"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
x:Name="Effect">
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<Border
x:Name="Border"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding assists:ControlAssist.CornerRadius}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
UseLayoutRounding="True"
x:Name="Border">
UseLayoutRounding="True">
<!-- Content -->
<Grid>
<Grid.ColumnDefinitions>
@@ -63,19 +63,19 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
<!-- 关闭图标 为了让触发Close范围足够大而不是只有Path的才能触发套了一层Border -->
<Border
Background="Transparent"
x:Name="PART_Close"
Grid.Column="1"
VerticalAlignment="Center"
Visibility="Collapsed"
x:Name="PART_Close">
Background="Transparent"
Visibility="Collapsed">
<controls:IconElement
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource ToolIcon}"
@@ -87,7 +87,7 @@
</decorations:EmbossBorder>
<ControlTemplate.Triggers>
<Trigger Property="Closable" Value="True">
<Setter Property="Visibility" TargetName="PART_Close" Value="Visible" />
<Setter TargetName="PART_Close" Property="Visibility" Value="Visible" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -108,16 +108,16 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:Tag}">
<Border
x:Name="Border"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding assists:ControlAssist.CornerRadius}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
UseLayoutRounding="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
x:Name="Border">
UseLayoutRounding="True">
<!-- Content -->
<Grid>
<Grid.ColumnDefinitions>
@@ -127,27 +127,27 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
<controls:IconElement
Background="Transparent"
Foreground="{TemplateBinding Foreground}"
x:Name="PART_Close"
Grid.Column="1"
Padding="1,-4,-4,-4"
Background="Transparent"
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource ToolIcon}"
Symbol="Close"
UseLayoutRounding="True"
Visibility="Collapsed"
x:Name="PART_Close" />
Visibility="Collapsed" />
</Grid>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Closable" Value="True">
<Setter Property="Visibility" TargetName="PART_Close" Value="Visible" />
<Setter TargetName="PART_Close" Property="Visibility" Value="Visible" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>