ShrlAlgo/AddinManager
1
0
Fork 0
mirror of https://github.com/ShrlAlgo/AddinManager.git synced 2026-03-08 00:48:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

更新样式

Browse Source
This commit is contained in:
GG Z
2026-01-23 21:43:46 +08:00
parent 9b7a6e2772
commit 8d800e8927
2 changed files with 111 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
AddInManager/Wpf/MainWindow.xaml
View File

@@ -70,11 +70,7 @@
Click="SelectAllButton_Click" Click="SelectAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="选中所有命令"> ToolTip="选中所有命令">
<TextBlock <Path Data="{StaticResource Geo.SelectAll}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE73E;" />
</Button> </Button>
<Button <Button
@@ -82,11 +78,7 @@
Click="SelectNoneButton_Click" Click="SelectNoneButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="取消选中应用"> ToolTip="取消选中应用">
<TextBlock <Path Data="{StaticResource Geo.DeselectAll}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE739;" />
</Button> </Button>
</UniformGrid> </UniformGrid>
<Rectangle <Rectangle
@@ -101,11 +93,7 @@
Click="ExpandAllButton_Click" Click="ExpandAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="展开所有节点"> ToolTip="展开所有节点">
<TextBlock <Path Data="{StaticResource Geo.Expand}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE972;" />
</Button> </Button>
<Button <Button
@@ -113,11 +101,7 @@
Click="CollapseAllButton_Click" Click="CollapseAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="折叠所有节点"> ToolTip="折叠所有节点">
<TextBlock <Path Data="{StaticResource Geo.Collapse}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE971;" />
</Button> </Button>
</UniformGrid> </UniformGrid>
</StackPanel> </StackPanel>
@@ -140,12 +124,7 @@
Click="ContextMenuRun_Click" Click="ContextMenuRun_Click"
Header="运行"> Header="运行">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.Run}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE768;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -154,14 +133,9 @@
<MenuItem <MenuItem
x:Name="ContextMenuLoad" x:Name="ContextMenuLoad"
Click="ContextMenuLoad_Click" Click="ContextMenuLoad_Click"
Header="加载新插件..."> Header="加载...">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.LoadAssembly}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE8E5;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem <MenuItem
@@ -169,12 +143,7 @@
Click="ContextMenuRemove_Click" Click="ContextMenuRemove_Click"
Header="移除"> Header="移除">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.Remove}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE74D;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem <MenuItem
@@ -182,12 +151,7 @@
Click="ContextMenuReload_Click" Click="ContextMenuReload_Click"
Header="重新加载"> Header="重新加载">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.Reload}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE895;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -198,12 +162,7 @@
Click="ContextMenuOpenInExplorer_Click" Click="ContextMenuOpenInExplorer_Click"
Header="在资源管理器中显示"> Header="在资源管理器中显示">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.Explorer}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE8B7;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem <MenuItem
@@ -211,12 +170,7 @@
Click="ContextMenuAssemblyInfo_Click" Click="ContextMenuAssemblyInfo_Click"
Header="查看程序集信息"> Header="查看程序集信息">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.Info}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE946;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</ContextMenu> </ContextMenu>
@@ -238,11 +192,7 @@
Click="AppSelectAllButton_Click" Click="AppSelectAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="选中所有应用"> ToolTip="选中所有应用">
<TextBlock <Path Data="{StaticResource Geo.SelectAll}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE73E;" />
</Button> </Button>
<Button <Button
@@ -250,11 +200,7 @@
Click="AppSelectNoneButton_Click" Click="AppSelectNoneButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="取消选中应用"> ToolTip="取消选中应用">
<TextBlock <Path Data="{StaticResource Geo.DeselectAll}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE739;" />
</Button> </Button>
</UniformGrid> </UniformGrid>
<Rectangle <Rectangle
@@ -270,11 +216,7 @@
Click="AppExpandAllButton_Click" Click="AppExpandAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="展开所有应用程序节点"> ToolTip="展开所有应用程序节点">
<TextBlock <Path Data="{StaticResource Geo.Expand}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE972;" />
</Button> </Button>
<Button <Button
@@ -282,11 +224,7 @@
Click="AppCollapseAllButton_Click" Click="AppCollapseAllButton_Click"
Style="{StaticResource ToolbarButton}" Style="{StaticResource ToolbarButton}"
ToolTip="折叠所有应用程序节点"> ToolTip="折叠所有应用程序节点">
<TextBlock <Path Data="{StaticResource Geo.Collapse}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
Text="&#xE971;" />
</Button> </Button>
</UniformGrid> </UniformGrid>
</StackPanel> </StackPanel>
@@ -348,9 +286,10 @@
Margin="5" Margin="5"
Click="RunButton_Click" Click="RunButton_Click"
Style="{StaticResource ActionButton}" Style="{StaticResource ActionButton}"
Tag="Primary"> Tag="Primary"
ToolTip="运行选中的外部命令或应用程序">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE768;" /> <Path Data="{StaticResource Geo.Run}" />
<TextBlock Margin="5,0,0,0" Text="运行" /> <TextBlock Margin="5,0,0,0" Text="运行" />
</StackPanel> </StackPanel>
</Button> </Button>
@@ -359,9 +298,10 @@
Margin="5" Margin="5"
Click="LoadButton_Click" Click="LoadButton_Click"
Style="{StaticResource ActionButton}" Style="{StaticResource ActionButton}"
Tag="Primary"> Tag="Primary"
ToolTip="加载程序集">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE8E5;" /> <Path Data="{StaticResource Geo.LoadAssembly}" />
<TextBlock Margin="5,0,0,0" Text="加载" /> <TextBlock Margin="5,0,0,0" Text="加载" />
</StackPanel> </StackPanel>
</Button> </Button>
@@ -371,38 +311,35 @@
Click="RemoveButton_Click" Click="RemoveButton_Click"
LostFocus="RemoveButton_LostFocus" LostFocus="RemoveButton_LostFocus"
Style="{StaticResource ActionButton}" Style="{StaticResource ActionButton}"
Tag="Danger"> Tag="Danger"
ToolTip="移除选中的外部命令或应用程序">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Path Data="{StaticResource Geo.Remove}" />
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE74D;" />
<TextBlock Margin="5,0,0,0" Text="移除" /> <TextBlock Margin="5,0,0,0" Text="移除" />
</StackPanel> </StackPanel>
</Button> </Button>
<Button <Button
x:Name="saveSplitButton" x:Name="saveSplitButton"
Margin="5" Margin="5"
Click="SaveSplitButton_Click"> Click="SaveSplitButton_Click"
Style="{StaticResource ActionButton}"
Tag="Primary"
ToolTip="保存addin文件">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xEA35;" /> <Path Data="{StaticResource Geo.Save}" />
<TextBlock Margin="5,0,0,0" Text="保存" /> <TextBlock Margin="5,0,0,0" Text="保存" />
</StackPanel> </StackPanel>
<Button.ContextMenu> <Button.ContextMenu>
<ContextMenu x:Name="saveContextMenu"> <ContextMenu x:Name="saveContextMenu">
<MenuItem Click="SaveToAddinMenuItem_Click" Header="保存选中项到 Addins 文件夹"> <MenuItem Click="SaveToAddinMenuItem_Click" Header="保存选中项到 Addins 文件夹">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.SaveToDirectory}" />
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE78C;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<Separator /> <Separator />
<MenuItem Click="SaveLocalMenuItem_Click" Header="保存选中项到本地 .addin 文件"> <MenuItem Click="SaveLocalMenuItem_Click" Header="保存选中项到本地 .addin 文件">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock <Path Data="{StaticResource Geo.SaveToFile}" />
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Text="&#xE792;" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</ContextMenu> </ContextMenu>

105
AddInManager/Wpf/Styles/ModernStyles.xaml
View File

@@ -21,10 +21,64 @@
<SolidColorBrush x:Key="SecondaryTextBrush" Color="#605E5C" /> <SolidColorBrush x:Key="SecondaryTextBrush" Color="#605E5C" />
<SolidColorBrush x:Key="DisabledBrush" Color="#CCCCCC" /> <SolidColorBrush x:Key="DisabledBrush" Color="#CCCCCC" />
<SolidColorBrush x:Key="DisabledTextBrush" Color="#888888" /> <SolidColorBrush x:Key="DisabledTextBrush" Color="#888888" />
<!-- 全选 -->
<StreamGeometry x:Key="Geo.SelectAll">M1,1 H10 V10 H1 Z M5,5 H14 V14 H5 Z</StreamGeometry>
<!-- 取消全选 -->
<StreamGeometry x:Key="Geo.DeselectAll">M2,2 H14 V14 H2 Z M5,5 L11,11 M11,5 L5,11</StreamGeometry>
<!-- 折叠 (收起 - 减号/方框风格) -->
<StreamGeometry x:Key="Geo.Collapse">M2,2 H14 V14 H2 Z M5,8 H11</StreamGeometry>
<!-- 展开 (拉开 - 加号/方框风格) -->
<StreamGeometry x:Key="Geo.Expand">M2,2 H14 V14 H2 Z M5,8 H11 M8,5 V11</StreamGeometry>
<!-- 搜索 -->
<StreamGeometry x:Key="Geo.Search">M11,11 L15,15 M7,12 A5,5 0 1,1 7,2 A5,5 0 0,1 7,12</StreamGeometry>
<!-- 运行 -->
<StreamGeometry x:Key="Geo.Run">M5,3 L13,8 L5,13 Z</StreamGeometry>
<!-- 加载 -->
<StreamGeometry x:Key="Geo.LoadAssembly">M2,4 H8 V10 H2 Z M5,2 H11 V8 H5 Z M10,10 L15,10 M13,8 L15,10 L13,12</StreamGeometry>
<!-- 重新加载 -->
<StreamGeometry x:Key="Geo.Reload">M13,8 A5,5 0 1,1 10.5,3.5 M10.5,1 V3.5 H13</StreamGeometry>
<!-- 移除 -->
<StreamGeometry x:Key="Geo.Remove">M2,3 H14 M5,3 V14 H11 V3 M7,6 V11 M9,6 V11 M6,1 H10 V3 H6 Z</StreamGeometry>
<!-- 保存 -->
<StreamGeometry x:Key="Geo.Save">M3,2 H11 L14,5 V14 H3 Z M5,2 V6 H10 V2 M5,14 V10 H11 V14</StreamGeometry>
<!-- 保存到本地目录 (文件夹 + 向下箭头/盘片) -->
<StreamGeometry x:Key="Geo.SaveToDirectory">M1,3 H6 L8,5 H15 V13 H1 Z M11,7 V10 M9,8 L11,10 L13,8</StreamGeometry>
<!-- 保存到文件 (文档 + 磁盘) -->
<StreamGeometry x:Key="Geo.SaveToFile">M3,1 H10 L13,4 V15 H3 Z M5,12 H11 M5,9 H11 M9,1 V4 H12</StreamGeometry>
<!-- 查看信息 (i) -->
<StreamGeometry x:Key="Geo.Info">M8,1 A7,7 0 1,1 8,15 A7,7 0 0,1 8,1 M8,7 V11 M8,4 V4.5</StreamGeometry>
<!-- Windows资源管理器 (文件夹) -->
<StreamGeometry x:Key="Geo.Explorer">M1,3 H6 L8,5 H15 V13 H1 Z</StreamGeometry>
<!-- 定义一个通用 Path 样式，省得每次写重复属性 -->
<Style TargetType="Path">
<Setter Property="Stretch" Value="Uniform" />
<Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource AncestorType=Control}, Path=Foreground}" />
<Setter Property="StrokeThickness" Value="1.5" />
<Setter Property="StrokeLineJoin" Value="Round" />
<Setter Property="StrokeStartLineCap" Value="Round" />
<Setter Property="StrokeEndLineCap" Value="Round" />
<Setter Property="Width" Value="16" />
<Setter Property="Height" Value="16" />
</Style>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="14" />
</Style> </Style>
<Style TargetType="Button"> <Style TargetType="Button">
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
@@ -51,6 +105,7 @@
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="{StaticResource DisabledBrush}" /> <Setter Property="Background" Value="{StaticResource DisabledBrush}" />
<Setter Property="Foreground" Value="{StaticResource DisabledTextBrush}" /> <Setter Property="Foreground" Value="{StaticResource DisabledTextBrush}" />
<Setter Property="BorderThickness" Value="0" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@@ -81,15 +136,13 @@
<!-- 当 Tag="Primary" 时，应用主要按钮颜色 --> <!-- 当 Tag="Primary" 时，应用主要按钮颜色 -->
<DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary"> <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary">
<Setter Property="Background" Value="{StaticResource PrimaryBrush}" /> <Setter Property="Foreground" Value="{StaticResource PrimaryBrush}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="BorderBrush" Value="{StaticResource PrimaryBrush}" /> <Setter Property="BorderBrush" Value="{StaticResource PrimaryBrush}" />
</DataTrigger> </DataTrigger>
<!-- 当 Tag="Danger" 时，应用危险按钮颜色 --> <!-- 当 Tag="Danger" 时，应用危险按钮颜色 -->
<DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger"> <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger">
<Setter Property="Background" Value="{StaticResource DangerBrush}" /> <Setter Property="Foreground" Value="{StaticResource DangerBrush}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="BorderBrush" Value="{StaticResource DangerBrush}" /> <Setter Property="BorderBrush" Value="{StaticResource DangerBrush}" />
</DataTrigger> </DataTrigger>
@@ -103,7 +156,7 @@
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary" /> <Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary" />
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}" Value="True" /> <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}" Value="True" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" Value="{StaticResource PrimaryHoverBrush}" /> <Setter Property="Foreground" Value="{StaticResource PrimaryHoverBrush}" />
</MultiDataTrigger> </MultiDataTrigger>
<!-- 当 Tag="Primary" 并且 IsPressed="True" --> <!-- 当 Tag="Primary" 并且 IsPressed="True" -->
@@ -112,7 +165,7 @@
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary" /> <Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Primary" />
<Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}" Value="True" /> <Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}" Value="True" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" Value="{StaticResource PrimaryPressedBrush}" /> <Setter Property="Foreground" Value="{StaticResource PrimaryPressedBrush}" />
</MultiDataTrigger> </MultiDataTrigger>
<!-- 当 Tag="Danger" 并且 IsMouseOver="True" --> <!-- 当 Tag="Danger" 并且 IsMouseOver="True" -->
@@ -121,7 +174,7 @@
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger" /> <Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger" />
<Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}" Value="True" /> <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}" Value="True" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" Value="{StaticResource DangerHoverBrush}" /> <Setter Property="Foreground" Value="{StaticResource DangerHoverBrush}" />
</MultiDataTrigger> </MultiDataTrigger>
<!-- 当 Tag="Danger" 并且 IsPressed="True" --> <!-- 当 Tag="Danger" 并且 IsPressed="True" -->
@@ -130,8 +183,13 @@
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger" /> <Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Self}}" Value="Danger" />
<Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}" Value="True" /> <Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}" Value="True" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" Value="{StaticResource DangerPressedBrush}" /> <Setter Property="Foreground" Value="{StaticResource DangerPressedBrush}" />
</MultiDataTrigger> </MultiDataTrigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="{StaticResource DisabledBrush}" />
<Setter Property="Foreground" Value="{StaticResource DisabledTextBrush}" />
<Setter Property="BorderThickness" Value="0" />
</Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<!-- 浏览按钮样式 --> <!-- 浏览按钮样式 -->
@@ -265,16 +323,10 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 搜索图标 --> <!-- 搜索图标 -->
<TextBlock <Path
Margin="8,0,0,0" Margin="4,4,0,0"
HorizontalAlignment="Left" Data="{StaticResource Geo.Search}"
VerticalAlignment="Center" Stroke="{StaticResource SecondaryTextBrush}" />
FontFamily="Segoe MDL2 Assets"
FontSize="12"
Foreground="{StaticResource SecondaryTextBrush}"
IsHitTestVisible="False"
Text="&#xE721;" />
<!-- 这是TextBox实际输入内容的地方 --> <!-- 这是TextBox实际输入内容的地方 -->
<ScrollViewer <ScrollViewer
x:Name="PART_ContentHost" x:Name="PART_ContentHost"
@@ -288,6 +340,7 @@
x:Name="Watermark" x:Name="Watermark"
Grid.Column="1" Grid.Column="1"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
Padding="2,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource SecondaryTextBrush}" Foreground="{StaticResource SecondaryTextBrush}"
IsHitTestVisible="False" IsHitTestVisible="False"
@@ -672,9 +725,14 @@
<!-- 选中状态的勾选标记 --> <!-- 选中状态的勾选标记 -->
<Path <Path
x:Name="CheckMark" x:Name="CheckMark"
Width="12"
Height="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="M 3,9 L 7,13 L 15,5" Data="M 3,9 L 7,13 L 15,5"
Fill="Transparent" Fill="Transparent"
Stroke="White" Stretch="Uniform"
Stroke="{StaticResource PrimaryBrush}"
StrokeLineJoin="Round" StrokeLineJoin="Round"
StrokeThickness="2" StrokeThickness="2"
Visibility="Collapsed" /> Visibility="Collapsed" />
@@ -686,7 +744,7 @@
Height="2" Height="2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Fill="White" Fill="{StaticResource PrimaryBrush}"
Visibility="Collapsed" /> Visibility="Collapsed" />
</Grid> </Grid>
</Border> </Border>
@@ -700,14 +758,14 @@
<!-- 选中状态 --> <!-- 选中状态 -->
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="CheckMark" Property="Visibility" Value="Visible" /> <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryBrush}" /> <!--<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryBrush}" />-->
<Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryBrush}" /> <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryBrush}" />
</Trigger> </Trigger>
<!-- 不确定状态 --> <!-- 不确定状态 -->
<Trigger Property="IsChecked" Value="{x:Null}"> <Trigger Property="IsChecked" Value="{x:Null}">
<Setter TargetName="IndeterminateMark" Property="Visibility" Value="Visible" /> <Setter TargetName="IndeterminateMark" Property="Visibility" Value="Visible" />
<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryBrush}" /> <!--<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryBrush}" />-->
<Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryBrush}" /> <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryBrush}" />
</Trigger> </Trigger>
@@ -730,7 +788,6 @@
<Condition Property="IsMouseOver" Value="True" /> <Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsChecked" Value="True" /> <Condition Property="IsChecked" Value="True" />
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryHoverBrush}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryHoverBrush}" /> <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryHoverBrush}" />
</MultiTrigger> </MultiTrigger>
@@ -740,13 +797,11 @@
<Condition Property="IsMouseOver" Value="True" /> <Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsChecked" Value="{x:Null}" /> <Condition Property="IsChecked" Value="{x:Null}" />
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryHoverBrush}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryHoverBrush}" /> <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryHoverBrush}" />
</MultiTrigger> </MultiTrigger>
<!-- 按下状态 --> <!-- 按下状态 -->
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter TargetName="Border" Property="Background" Value="{StaticResource PrimaryPressedBrush}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryPressedBrush}" /> <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource PrimaryPressedBrush}" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>