chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synchronize RepeatButton & ToggleButton

Browse Source
This commit is contained in:
NaBian committed 2020-11-26 22:26:25 +08:00
1 parent c0a1ee7479
commit 2bb2618592
4 files changed
+17 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml
+1 -1
View File
@@ -49,7 +49,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Height="18" Width="18" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
<Border Height="18" Width="18" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
<hc:SimplePanel Grid.Column="0" Height="18" Width="18" x:Name="markGrid" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Path UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}"/>
<Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0"/>
src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
+5 -8
View File
@@ -10,23 +10,20 @@
<!--region Button-->
<Style
x:Key="ButtonDefault"
BasedOn="{StaticResource ButtonBaseStyle}"
TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
<Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
<Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button"/>
<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
+8 -1
View File
@@ -10,7 +10,7 @@
<!--region RepeatButton-->
<Style BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1"/>
<Style.Triggers>
@@ -22,18 +22,25 @@
</Trigger>
</Style.Triggers>
</Style>
<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton"/>
<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
</Style>
<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
</Style>
<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
</Style>
<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
</Style>
<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
</Style>
src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
+3 -1
View File
@@ -9,7 +9,7 @@
</ResourceDictionary.MergedDictionaries>
<!--普通-->
<Style BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1"/>
@@ -23,6 +23,8 @@
</Style.Triggers>
</Style>
<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton"/>
<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
</Style>