Merge pull request #70 from Leo-Corporation/vNext

Version 3.6.0.2110
Leo-Corporation · Oct 20, 2021 · a51483a · a51483a
2 parents 9364eb0 + 051e540
commit a51483a
Show file tree

Hide file tree

Showing 12 changed files with 396 additions and 68 deletions.
diff --git a/ColorPicker.Setup/Setup.iss b/ColorPicker.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ColorPicker"
-#define MyAppVersion "3.5.0.2109"
-#define MyAppFullVersion "3.5.0.2109"
+#define MyAppVersion "3.6.0.2110"
+#define MyAppFullVersion "3.6.0.2110"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "ColorPicker.exe"

diff --git a/ColorPicker/Classes/Global.cs b/ColorPicker/Classes/Global.cs
@@ -40,7 +40,7 @@ public static class Global
 		/// <summary>
 		/// The current version of ColorPicker.
 		/// </summary>
-		public static string Version => "3.5.0.2109";
+		public static string Version => "3.6.0.2110";
 
 		/// <summary>
 		/// List of the available languages.

diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>ColorPicker.ico</ApplicationIcon>
-    <Version>3.5.0.2109</Version>
+    <Version>3.6.0.2110</Version>
     <Authors>Léo Corporation</Authors>
     <Copyright>© 2021</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="ColorHelper" Version="1.6.0" />
-    <PackageReference Include="LeoCorpLibrary" Version="3.10.0.2109" />
+    <PackageReference Include="LeoCorpLibrary" Version="3.11.0.2110" />
     <PackageReference Include="MouseKeyHook" Version="5.6.0" />
   </ItemGroup>
 

diff --git a/ColorPicker/Pages/PalettePage.xaml b/ColorPicker/Pages/PalettePage.xaml
@@ -1,17 +1,18 @@
 <Page x:Class="ColorPicker.Pages.PalettePage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:ColorPicker.Pages"
-      xmlns:lang="clr-namespace:ColorPicker.Properties"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+	  xmlns:local="clr-namespace:ColorPicker.Pages"
+	  xmlns:lang="clr-namespace:ColorPicker.Properties"
 	  mc:Ignorable="d" 
 	  Foreground="{Binding Source={StaticResource Foreground1}}"
 	  d:DesignHeight="350" d:DesignWidth="560"
 	  FontFamily="../Fonts/#Montserrat"
-      Title="PalettePage">
+	  Title="PalettePage">
 
-    <Grid>
+	<ScrollViewer HorizontalScrollBarVisibility="Hidden" Template="{DynamicResource ScrollViewerControlTemplate}" CanContentScroll="True" Height="344">
+
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition/>
@@ -25,65 +26,132 @@
 						<ColumnDefinition Width="Auto"/>
 					</Grid.ColumnDefinitions>
 					<TextBlock Text="{x:Static lang:Resources.Palette}" Foreground="{Binding Source={StaticResource Foreground1}}" FontSize="16"/>
-					<Button Content="&#xF2F6;" Padding="5" x:Name="RandomColorBtn" Click="RandomColorBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0">
-						<Button.ToolTip>
-							<ToolTip Content="{x:Static lang:Resources.PickRandomColor}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Button.ToolTip>
-					</Button>
+					<StackPanel Grid.Column="1" Orientation="Horizontal">
+						<Button Content="&#xF2F6;" Padding="5" x:Name="RandomColorBtn" Click="RandomColorBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="0,0,5,0">
+							<Button.ToolTip>
+								<ToolTip Content="{x:Static lang:Resources.PickRandomColor}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Button.ToolTip>
+						</Button>
+						<Button Content="&#xF47F;" Padding="5" x:Name="HistoryBtn" Click="HistoryBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14">
+							<Button.ToolTip>
+								<ToolTip Content="{x:Static lang:Resources.History}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Button.ToolTip>
+						</Button>
+					</StackPanel>
 				</Grid>
-				<StackPanel Orientation="Horizontal">
-					<Border x:Name="ColorDisplayer" CornerRadius="10" Margin="10" Grid.Column="0" Height="50" Width="50" HorizontalAlignment="Left"/>
-					<TextBlock Text="{x:Static lang:Resources.RGB}" VerticalAlignment="Center"/>
-					<TextBox MinHeight="24" x:Name="RGBTxt" TextChanged="RGBTxt_TextChanged" Width="150" Style="{DynamicResource TextBoxStyle1}" BorderBrush="{Binding Source={StaticResource AccentColor}}" CaretBrush="{Binding Source={StaticResource Foreground1}}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderThickness="2" Margin="10,0,0,0" VerticalAlignment="Center"/>
-				</StackPanel>
+				<StackPanel x:Name="PaletteContent">
+					<StackPanel Orientation="Horizontal">
+						<Border x:Name="ColorDisplayer" CornerRadius="10" Margin="10" Grid.Column="0" Height="50" Width="50" HorizontalAlignment="Left"/>
+						<ComboBox x:Name="ColorTypeComboBox" Foreground="{Binding Source={StaticResource Foreground1}}" Style="{DynamicResource ComboBoxStyle1}" Margin="10,0,0,0" BorderThickness="2" Padding="5" VerticalAlignment="Center" SelectedIndex="0">
+							<ComboBoxItem Content="{x:Static lang:Resources.RGB}"/>
+							<ComboBoxItem Content="{x:Static lang:Resources.HEX}"/>
+						</ComboBox>
+						<TextBox MinHeight="24" x:Name="RGBTxt" TextChanged="RGBTxt_TextChanged" Width="150" Style="{DynamicResource TextBoxStyle1}" BorderBrush="{Binding Source={StaticResource AccentColor}}" CaretBrush="{Binding Source={StaticResource Foreground1}}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}" BorderThickness="2" Margin="10,0,0,0" VerticalAlignment="Center"/>
+						<Button Content="&#xF2F4;" Padding="5" x:Name="AddToHistoryBtn" Click="AddToHistoryBtn_Click" FontFamily="..\Fonts\#FluentSystemIcons-Regular" Grid.Column="1" Style="{DynamicResource TabButtonStyle}" Background="{Binding Source={StaticResource AccentColor}}" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontSize="14" Margin="10,0,5,0" VerticalAlignment="Center">
+							<Button.ToolTip>
+								<ToolTip Content="{x:Static lang:Resources.AddToHistory}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Button.ToolTip>
+						</Button>
+					</StackPanel>
+
+					<TextBlock Text="{x:Static lang:Resources.Shades}"/>
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<Border x:Name="DarkShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="DarkShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="RegularShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="RegularShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="BaseShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="BaseShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="TintShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="TintShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+					</StackPanel>
+
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<Border x:Name="DRegularShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="DRegularShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="DDarkShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="DDarkShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="DBaseShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="DBaseShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="DTintShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="DTintShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+					</StackPanel>
 
-				<TextBlock Text="{x:Static lang:Resources.Shades}"/>
-				<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-					<Border x:Name="DarkShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="DarkShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="RegularShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="RegularShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="BaseShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="BaseShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="TintShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="TintShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
+					<TextBlock Text="{x:Static lang:Resources.Brightness}"/>
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+						<Border x:Name="Light1" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light1ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light2" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light2ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light3" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light3ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light4" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light4ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+					</StackPanel>
+					<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,50">
+						<Border x:Name="Light5" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light5ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light6" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light6ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light7" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light7ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+						<Border x:Name="Light8" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
+							<Border.ToolTip>
+								<ToolTip x:Name="Light8ToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
+							</Border.ToolTip>
+						</Border>
+					</StackPanel>
 				</StackPanel>
+				<StackPanel Visibility="Collapsed" x:Name="HistoryDisplayer" Margin="0,0,0,30">
 
-				<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-					<Border x:Name="DRegularShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="DRegularShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="DDarkShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="DDarkShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="DBaseShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="DBaseShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
-					<Border x:Name="DTintShade" MouseLeftButtonUp="DarkShade_MouseLeftButtonUp" Cursor="Hand" CornerRadius="10" Margin="10" Height="50" Width="50">
-						<Border.ToolTip>
-							<ToolTip x:Name="DTintShadeToolTip" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
-						</Border.ToolTip>
-					</Border>
 				</StackPanel>
 			</StackPanel>
 		</Grid>
-	</Grid>
+
+	</ScrollViewer>
 </Page>