整理
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:assists="clr-namespace:NeumUI.Assists"
|
||||
xmlns:controls="clr-namespace:NeumUI.Controls"
|
||||
xmlns:svd="clr-namespace:NeumUI.Controls.Decorations"
|
||||
xmlns:assists="clr-namespace:NeoUI.Assists"
|
||||
xmlns:controls="clr-namespace:NeoUI.Controls"
|
||||
xmlns:svd="clr-namespace:NeoUI.Controls.Decorations"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="/NeumUI;component/Animations/Animations.xaml" />
|
||||
<ResourceDictionary Source="/NeoUI;component/Animations/Animations.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<!-- 按钮高亮 -->
|
||||
<Storyboard x:Key="Button.FocusEffect">
|
||||
@@ -170,18 +170,18 @@
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
||||
<!-- 前缀 -->
|
||||
<controls:SymbolIcon
|
||||
<!-- 图标 -->
|
||||
<controls:IconElement
|
||||
DockPanel.Dock="{Binding Path=(assists:ButtonAssist.IconPlacement), RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Focusable="False"
|
||||
Margin="0,0,5,0"
|
||||
RenderTransformOrigin="0.5,0.5"
|
||||
Symbol="{Binding Path=(assists:ButtonAssist.Icon), RelativeSource={RelativeSource TemplatedParent}}"
|
||||
x:Name="Icon">
|
||||
<controls:SymbolIcon.RenderTransform>
|
||||
<controls:IconElement.RenderTransform>
|
||||
<RotateTransform />
|
||||
</controls:SymbolIcon.RenderTransform>
|
||||
</controls:SymbolIcon>
|
||||
</controls:IconElement.RenderTransform>
|
||||
</controls:IconElement>
|
||||
<!-- 内容 -->
|
||||
<ContentPresenter
|
||||
Focusable="False"
|
||||
@@ -260,7 +260,7 @@
|
||||
<Setter Property="assists:ShadingAssist.LightedBorder">
|
||||
<Setter.Value>
|
||||
<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
|
||||
<GradientStop Color="{DynamicResource PrimaryDefaultColor}" Offset="0" />
|
||||
<GradientStop Color="{DynamicResource PrimaryNormalColor}" Offset="0" />
|
||||
<GradientStop Color="Transparent" Offset="0.5" />
|
||||
<LinearGradientBrush.RelativeTransform>
|
||||
<RotateTransform Angle="45" CenterX="0.5" CenterY="0.5" />
|
||||
|
||||
Reference in New Issue
Block a user