Added UI logic for Startup section (#149)

Leo-Corporation · Jul 8, 2022 · 54d6407 · 54d6407
1 parent 755aca3
commit 54d6407
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/ColorPicker/Pages/SettingsPage.xaml b/ColorPicker/Pages/SettingsPage.xaml
@@ -170,19 +170,19 @@
 						<Border x:Name="PickerPageBorder" CornerRadius="10" Margin="5" Background="{Binding Source={StaticResource Background1}}" BorderThickness="3" BorderBrush="{x:Null}" MouseEnter="Border_MouseEnter" MouseLeave="Border_MouseLeave" Cursor="Hand" MouseLeftButtonUp="PickerPageBorder_MouseLeftButtonUp">
 							<StackPanel	Orientation="Vertical">
                                 <TextBlock Text="&#xF2FC;" Margin="20" FontSize="64" FontFamily="..\Fonts\#FluentSystemIcons-Regular" HorizontalAlignment="Center"/>
-								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="GeneratePageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Picker}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
+								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="PickerPageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Picker}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
 							</StackPanel>
 						</Border>
 						<Border x:Name="ConverterPageBorder" CornerRadius="10" Margin="5" Background="{Binding Source={StaticResource Background1}}" BorderThickness="3" BorderBrush="{x:Null}" MouseEnter="Border_MouseEnter" MouseLeave="Border_MouseLeave" Cursor="Hand" MouseLeftButtonUp="ConverterPageBorder_MouseLeftButtonUp">
 							<StackPanel	Orientation="Vertical">
                                 <TextBlock Text="&#xF18E;" Margin="20" FontSize="64" FontFamily="..\Fonts\#FluentSystemIcons-Regular" HorizontalAlignment="Center"/>
-								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="StrengthPageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Converter}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
+								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="ConverterPageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Converter}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
 							</StackPanel>
 						</Border>
 						<Border x:Name="PalettePageBorder" CornerRadius="10" Margin="5" Background="{Binding Source={StaticResource Background1}}" BorderThickness="3" BorderBrush="{x:Null}" MouseEnter="Border_MouseEnter" MouseLeave="Border_MouseLeave" Cursor="Hand" MouseLeftButtonUp="PalettePageBorder_MouseLeftButtonUp">
 							<StackPanel	Orientation="Vertical">
                                 <TextBlock Text="&#xF2F6;" Margin="20" FontSize="64" FontFamily="..\Fonts\#FluentSystemIcons-Regular" HorizontalAlignment="Center"/>
-								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="EncryptionPageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Palette}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
+								<RadioButton Style="{DynamicResource RadioButtonStyle1}" x:Name="PalettePageRadioBtn" GroupName="StartupPageRadioGroup" Content="{x:Static lang:Resources.Palette}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderBrush="#2153E0" FontWeight="Bold" FontSize="13" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2"/>
 							</StackPanel>
 						</Border>
 					</StackPanel>

diff --git a/ColorPicker/Pages/SettingsPage.xaml.cs b/ColorPicker/Pages/SettingsPage.xaml.cs
@@ -430,7 +430,7 @@ private void Border_MouseEnter(object sender, MouseEventArgs e)
 	private void Border_MouseLeave(object sender, MouseEventArgs e)
 	{
 		Border border = (Border)sender;
-		if (border != CheckedBorder)
+		if (border != CheckedBorder && border != PageCheckedBorder)
 		{
 			border.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color 
 		}
@@ -554,19 +554,35 @@ private void CreditsBtn_Click(object sender, RoutedEventArgs e)
 			Properties.Resources.CreditsAndThanks, MessageBoxButton.OK, MessageBoxImage.Information);
 	}
 
-	private void PickerPageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+	private void RefreshStartupBorders()
 	{
+		PickerPageBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color
+		ConverterPageBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color
+		PalettePageBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color		
 
+		PageCheckedBorder.BorderBrush = new SolidColorBrush() { Color = (Color)ColorConverter.ConvertFromString(App.Current.Resources["AccentColor"].ToString()) }; // Set color
 	}
 
-	private void ConverterPageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+	Border PageCheckedBorder { get; set; }
+	private void PickerPageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 	{
+		PageCheckedBorder = PickerPageBorder; // Set
+		PickerPageRadioBtn.IsChecked = true;
+		RefreshStartupBorders(); // Refresh
+	}
 
+	private void ConverterPageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+	{
+		PageCheckedBorder = ConverterPageBorder; // Set
+		ConverterPageRadioBtn.IsChecked = true;
+		RefreshStartupBorders(); // Refresh
 	}
 
 	private void PalettePageBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 	{
-
+		PageCheckedBorder = PalettePageBorder; // Set
+		PalettePageRadioBtn.IsChecked = true;
+		RefreshStartupBorders(); // Refresh
 	}
 
 	private void EditSelectShortcutBtn_Click(object sender, RoutedEventArgs e)