命名调整
This commit is contained in:
@@ -1354,64 +1354,6 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- Menu Style 全面重写,提升整体感和圆角 -->
|
||||
<Style
|
||||
BasedOn="{StaticResource GlassBase}"
|
||||
TargetType="Menu"
|
||||
x:Key="GlassMenu">
|
||||
<Setter Property="Background" Value="{StaticResource GlassGradientBrushHorizontal}" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="Padding" Value="4" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="Menu">
|
||||
<Border
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="6">
|
||||
<StackPanel IsItemsHost="True" Orientation="Horizontal" />
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style TargetType="MenuItem" x:Key="GlassMenuItem">
|
||||
<Setter Property="Background" Value="{StaticResource GlassGradientBrushHorizontal}" />
|
||||
<Setter Property="BorderBrush" Value="{StaticResource GlassBorderBrush}" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="FontSize" Value="13" />
|
||||
<Setter Property="Foreground" Value="{StaticResource PrimaryTextBrush}" />
|
||||
<Setter Property="Margin" Value="2,2,2,2" />
|
||||
<Setter Property="Padding" Value="10,6" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="MenuItem">
|
||||
<Border
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="5"
|
||||
x:Name="Bd">
|
||||
<Grid>
|
||||
<ContentPresenter
|
||||
ContentSource="Header"
|
||||
Margin="8,0,8,0"
|
||||
VerticalAlignment="Center" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsHighlighted" Value="True">
|
||||
<Setter Property="Background" TargetName="Bd" Value="#33B0E0FF" />
|
||||
<Setter Property="Foreground" Value="#FF222222" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- TabControl/TabItem Style 全面重写,修复内容显示和Header对齐 -->
|
||||
<Style
|
||||
BasedOn="{StaticResource GlassBase}"
|
||||
@@ -1444,68 +1386,4 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<!-- TabItem Style 优化 -->
|
||||
<Style TargetType="TabItem" x:Key="GlassTabItem">
|
||||
<Setter Property="Background" Value="{StaticResource GlassGradientBrush}" />
|
||||
<Setter Property="BorderBrush" Value="#B0E0FF" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="FontSize" Value="16" />
|
||||
<Setter Property="FontWeight" Value="SemiBold" />
|
||||
<Setter Property="Foreground" Value="{StaticResource PrimaryTextBrush}" />
|
||||
<Setter Property="Margin" Value="2,0,2,0" />
|
||||
<Setter Property="Padding" Value="20,10" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="TabItem">
|
||||
<Border
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="8,8,0,0"
|
||||
Margin="2,2,2,0"
|
||||
x:Name="Bd">
|
||||
<ContentPresenter
|
||||
ContentSource="Header"
|
||||
HorizontalAlignment="Center"
|
||||
RecognizesAccessKey="True"
|
||||
VerticalAlignment="Center"
|
||||
x:Name="ContentSite" />
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="Background" TargetName="Bd" Value="#33B0E0FF" />
|
||||
<Setter Property="BorderBrush" TargetName="Bd" Value="#B0E0FF" />
|
||||
<Setter Property="Foreground" Value="#FF222222" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" TargetName="Bd" Value="#11FFFFFF" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- ToolBar Style 全面重写,提升整体感和圆角 -->
|
||||
<Style
|
||||
BasedOn="{StaticResource GlassBase}"
|
||||
TargetType="ToolBar"
|
||||
x:Key="GlassToolBar">
|
||||
<Setter Property="Background" Value="{StaticResource GlassGradientBrushHorizontal}" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="Padding" Value="4" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ToolBar">
|
||||
<Border
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="6">
|
||||
<StackPanel IsItemsHost="True" Orientation="Horizontal" />
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
Reference in New Issue
Block a user