|
110 | 110 | </LinearGradientBrush.Transform> |
111 | 111 | </LinearGradientBrush> |
112 | 112 |
|
| 113 | + <LinearGradientBrush x:Key="DarkMode_ScaleGradientAccent"> |
| 114 | + <GradientStop Color="#7D5F00" Offset="0"/> |
| 115 | + <GradientStop Color="#8D3C2C" Offset="0.5"/> |
| 116 | + <GradientStop Color="#9D1743" Offset="1"/> |
| 117 | + <LinearGradientBrush.Transform> |
| 118 | + <RotateTransform Angle="45"/> |
| 119 | + </LinearGradientBrush.Transform> |
| 120 | + </LinearGradientBrush> |
| 121 | + |
113 | 122 | <LinearGradientBrush x:Key="DarkMode_ScaleGradientTransparent"> |
114 | 123 | <GradientStop Color="#ABFFC206" Offset="0"/> |
115 | 124 | <GradientStop Color="#ABff5f41" Offset="0.5"/> |
|
899 | 908 | <Setter.Value> |
900 | 909 | <ControlTemplate TargetType="{x:Type CheckBox}"> |
901 | 910 | <Border Width="auto" Background="Transparent" HorizontalAlignment="Left" Name="ContainerBorder" Margin="3"> |
902 | | - <Grid Margin="0,1,0,1"> |
| 911 | + <Grid Margin="0,0,0,0"> |
903 | 912 | <Grid.ColumnDefinitions> |
904 | 913 | <ColumnDefinition Width="auto"/> |
905 | 914 | <ColumnDefinition Width="*"/> |
906 | 915 | </Grid.ColumnDefinitions> |
907 | | - <Grid Grid.Column="0"> |
| 916 | + <Grid Grid.Column="0" |
| 917 | + Height="23"> |
908 | 918 |
|
909 | 919 |
|
910 | 920 | <Border |
911 | 921 | x:Name="ToggleContainer" |
912 | 922 | Margin="0,0,10,0" |
913 | 923 | VerticalAlignment="Center" |
914 | 924 | HorizontalAlignment="Center" |
915 | | - Height="26" |
916 | | - Width="26" |
| 925 | + Height="20" |
| 926 | + Width="20" |
917 | 927 | CornerRadius="4" |
918 | 928 | BorderThickness="2" |
919 | 929 |
|
|
923 | 933 | </Border> |
924 | 934 | <Path Fill="{StaticResource DarkMode_ScaleGradient}" |
925 | 935 | x:Name="CheckIcon" |
926 | | - VerticalAlignment="Center" |
| 936 | + VerticalAlignment="Top" |
927 | 937 | HorizontalAlignment="Left" |
928 | 938 |
|
929 | | - Margin="3,0,0,3" |
| 939 | + Margin="2,-1,0,5" |
930 | 940 | Data="m1.5,9.81739l1.12597,-1.29064l5.51853,3.66633l9.51508,-9.94252l0.96542,1.07474l-9.98959,14.80027l-7.13542,-8.30818z"/> |
931 | 941 |
|
932 | 942 | </Grid> |
|
946 | 956 |
|
947 | 957 | <Trigger Property="IsChecked" Value="True"> |
948 | 958 | <Setter Property="Visibility" TargetName="CheckIcon" Value="Visible"/> |
| 959 | + <Setter Property="BorderBrush" TargetName="ToggleContainer" Value="{StaticResource DarkMode_ScaleGradientAccent}"/> |
949 | 960 | </Trigger> |
950 | 961 |
|
951 | 962 | <Trigger Property="IsChecked" Value="False"> |
|
956 | 967 | <Setter Property="Fill" Value="{StaticResource DarkMode_ScaleHoverGradient}" TargetName="CheckIcon"/> |
957 | 968 | </Trigger> |
958 | 969 |
|
959 | | - <!--<MultiTrigger> |
| 970 | + <MultiTrigger> |
960 | 971 | <MultiTrigger.Conditions> |
961 | 972 | <Condition Property="IsMouseOver" Value="true"/> |
962 | 973 | <Condition Property="IsChecked" Value="true"/> |
963 | 974 | </MultiTrigger.Conditions> |
964 | 975 | <MultiTrigger.Setters> |
965 | | - <Setter Property="Background" Value="{StaticResource DarkMode_ScaleDisabledGradient}" TargetName="ToggleContainer"/> |
| 976 | + <Setter Property="Fill" Value="{StaticResource DarkMode_ScaleDisabledGradient}" TargetName="CheckIcon"/> |
966 | 977 | </MultiTrigger.Setters> |
967 | 978 | </MultiTrigger> |
968 | | -
|
| 979 | + |
969 | 980 | <MultiTrigger> |
970 | 981 | <MultiTrigger.Conditions> |
971 | 982 | <Condition Property="IsMouseOver" Value="true"/> |
972 | 983 | <Condition Property="IsChecked" Value="false"/> |
973 | 984 | </MultiTrigger.Conditions> |
974 | 985 | <MultiTrigger.Setters> |
975 | | - <Setter Property="Background" Value="{StaticResource DarkMode_ScaleHoverGradient}" TargetName="ToggleContainer"/> |
| 986 | + <Setter Property="Fill" Value="{StaticResource DarkMode_AccentColorE}" TargetName="CheckIcon"/> |
| 987 | + <Setter Property="Visibility" Value="Visible" TargetName="CheckIcon"/> |
| 988 | + <Setter Property="Opacity" Value="0.50" TargetName="CheckIcon"/> |
976 | 989 | </MultiTrigger.Setters> |
977 | | - </MultiTrigger>--> |
| 990 | + </MultiTrigger> |
978 | 991 |
|
979 | 992 | </ControlTemplate.Triggers> |
980 | 993 | </ControlTemplate> |
|
0 commit comments