Skip to content

Commit a19e606

Browse files
committed
Redesigned the checkbox checkbox
1 parent 19c8ff5 commit a19e606

22 files changed

+31
-18
lines changed
8 KB
Binary file not shown.

SyncPlayWPF/SyncPlayWPF/Pages/SettingsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<UserControl.Resources>
1111
<ResourceDictionary Source="../Themes/Generic.xaml"/>
1212
</UserControl.Resources>
13-
<Grid Margin="10">
13+
<Grid Margin="10,10,10,15">
1414

1515
<Grid.RowDefinitions>
1616
<RowDefinition/>
1717
<RowDefinition Height="auto"/>
1818
</Grid.RowDefinitions>
19-
<TabControl Margin="10,10,10,0" Grid.ColumnSpan="3">
19+
<TabControl Margin="10,10,10,5" Grid.ColumnSpan="3">
2020
<TabItem Header="Basics">
2121

2222

SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2021.249.10.0")]
55-
[assembly: AssemblyFileVersion("2021.249.10.0")]
54+
[assembly: AssemblyVersion("2021.249.22.0")]
55+
[assembly: AssemblyFileVersion("2021.249.22.0")]

SyncPlayWPF/SyncPlayWPF/Themes/Generic.xaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@
110110
</LinearGradientBrush.Transform>
111111
</LinearGradientBrush>
112112

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+
113122
<LinearGradientBrush x:Key="DarkMode_ScaleGradientTransparent">
114123
<GradientStop Color="#ABFFC206" Offset="0"/>
115124
<GradientStop Color="#ABff5f41" Offset="0.5"/>
@@ -899,21 +908,22 @@
899908
<Setter.Value>
900909
<ControlTemplate TargetType="{x:Type CheckBox}">
901910
<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">
903912
<Grid.ColumnDefinitions>
904913
<ColumnDefinition Width="auto"/>
905914
<ColumnDefinition Width="*"/>
906915
</Grid.ColumnDefinitions>
907-
<Grid Grid.Column="0">
916+
<Grid Grid.Column="0"
917+
Height="23">
908918

909919

910920
<Border
911921
x:Name="ToggleContainer"
912922
Margin="0,0,10,0"
913923
VerticalAlignment="Center"
914924
HorizontalAlignment="Center"
915-
Height="26"
916-
Width="26"
925+
Height="20"
926+
Width="20"
917927
CornerRadius="4"
918928
BorderThickness="2"
919929

@@ -923,10 +933,10 @@
923933
</Border>
924934
<Path Fill="{StaticResource DarkMode_ScaleGradient}"
925935
x:Name="CheckIcon"
926-
VerticalAlignment="Center"
936+
VerticalAlignment="Top"
927937
HorizontalAlignment="Left"
928938

929-
Margin="3,0,0,3"
939+
Margin="2,-1,0,5"
930940
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"/>
931941

932942
</Grid>
@@ -946,6 +956,7 @@
946956

947957
<Trigger Property="IsChecked" Value="True">
948958
<Setter Property="Visibility" TargetName="CheckIcon" Value="Visible"/>
959+
<Setter Property="BorderBrush" TargetName="ToggleContainer" Value="{StaticResource DarkMode_ScaleGradientAccent}"/>
949960
</Trigger>
950961

951962
<Trigger Property="IsChecked" Value="False">
@@ -956,25 +967,27 @@
956967
<Setter Property="Fill" Value="{StaticResource DarkMode_ScaleHoverGradient}" TargetName="CheckIcon"/>
957968
</Trigger>
958969

959-
<!--<MultiTrigger>
970+
<MultiTrigger>
960971
<MultiTrigger.Conditions>
961972
<Condition Property="IsMouseOver" Value="true"/>
962973
<Condition Property="IsChecked" Value="true"/>
963974
</MultiTrigger.Conditions>
964975
<MultiTrigger.Setters>
965-
<Setter Property="Background" Value="{StaticResource DarkMode_ScaleDisabledGradient}" TargetName="ToggleContainer"/>
976+
<Setter Property="Fill" Value="{StaticResource DarkMode_ScaleDisabledGradient}" TargetName="CheckIcon"/>
966977
</MultiTrigger.Setters>
967978
</MultiTrigger>
968-
979+
969980
<MultiTrigger>
970981
<MultiTrigger.Conditions>
971982
<Condition Property="IsMouseOver" Value="true"/>
972983
<Condition Property="IsChecked" Value="false"/>
973984
</MultiTrigger.Conditions>
974985
<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"/>
976989
</MultiTrigger.Setters>
977-
</MultiTrigger>-->
990+
</MultiTrigger>
978991

979992
</ControlTemplate.Triggers>
980993
</ControlTemplate>
512 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)