整理代码

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,12 +1,12 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Melskin.Controls"
xmlns:internal="clr-namespace:Melskin.Converters.Internal"
xmlns:ncd="clr-namespace:Melskin.Controls.Decorations"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:ncd="clr-namespace:Melskin.Controls.Decorations">
<Style TargetType="{x:Type controls:Avatar}" x:Key="SlotAvatarStyle">
<Style x:Key="SlotAvatarStyle" TargetType="{x:Type controls:Avatar}">
<Setter Property="Background" Value="{DynamicResource ControlBackgroundNormalBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource BorderNormalBrush}" />
<Setter Property="BorderThickness" Value="0" />
@@ -23,7 +23,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:Avatar}">
<Grid>
<ncd:EmbossBorder CornerRadius="{TemplateBinding CornerRadius}" Margin="-4">
<ncd:EmbossBorder Margin="-4" CornerRadius="{TemplateBinding CornerRadius}">
<!--<Grid>
<Grid.OpacityMask>
<VisualBrush Visual="{Binding ElementName=ClipMask}" />
@@ -38,21 +38,21 @@
</Grid>-->
</ncd:EmbossBorder>
<ncd:SlotBorder
Margin="-4"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
Intensity="0.2"
Margin="-4"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<Viewbox Stretch="{TemplateBinding Stretch}">
<ContentPresenter
Focusable="False"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="{TemplateBinding Padding}"
RecognizesAccessKey="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True" />
</Viewbox>
</ncd:SlotBorder>
</Grid>
@@ -79,19 +79,19 @@
<ControlTemplate TargetType="{x:Type controls:Avatar}">
<Grid>
<Border
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<Viewbox Stretch="{TemplateBinding Stretch}">
<ContentPresenter
Focusable="False"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="{TemplateBinding Padding}"
RecognizesAccessKey="True"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True" />
</Viewbox>
</Border>
</Grid>