Merge pull request #409 from Leo-Corporation/vNext

Version 6.2.1.2404
Leo-Corporation · Apr 23, 2024 · 21f9d0d · 21f9d0d
2 parents 5b412b3 + 28e5a5f
commit 21f9d0d
Show file tree

Hide file tree

Showing 7 changed files with 793 additions and 795 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 Max"
-#define MyAppVersion "6.2.0.2404"
-#define MyAppFullVersion "6.2.0.2404"
+#define MyAppVersion "6.2.1.2404"
+#define MyAppFullVersion "6.2.1.2404"
 #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
@@ -93,7 +93,7 @@ public static class Global
 	internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Settings.xml";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/ColorPicker/5.0/Version.txt";
 
-	public static string Version => "6.2.0.2404";
+	public static string Version => "6.2.1.2404";
 
 	public static string HiSentence
 	{

diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj
@@ -11,7 +11,7 @@
 	<Title>ColorPicker</Title>
 	<Description>Maximize your creativity.</Description>
 	<RepositoryUrl>https://github.com/Leo-Corporation/ColorPicker</RepositoryUrl>
-	<Version>6.2.0.2404</Version>
+	<Version>6.2.1.2404</Version>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<PackageIcon>logo.png</PackageIcon>
 	<ApplicationIcon>CPM.ico</ApplicationIcon>

diff --git a/ColorPicker/Pages/ConverterPage.xaml.cs b/ColorPicker/Pages/ConverterPage.xaml.cs
@@ -190,6 +190,8 @@ internal void LoadDetails(bool setColor = false)
 		ColorValidIconTxt.Text = "\uF299";
 		ColorValidIconTxt.Foreground = Global.GetColorFromResource("Green");
 
+		LoadBookmarkMenu();
+
 		// Load the bookmark icon
 		if (!Global.Bookmarks.ColorBookmarks.Contains(HexTxt.Text))
 		{

diff --git a/ColorPicker/Pages/HarmoniesPage.xaml.cs b/ColorPicker/Pages/HarmoniesPage.xaml.cs
@@ -210,6 +210,8 @@ internal void InitHarmonies()
 			MonochromaticPanel.Children.Add(border);
 		}
 
+		LoadBookmarkMenu();
+
 		// Load the bookmark icon
 		if (!Global.Bookmarks.ColorBookmarks.Contains($"#{ColorInfo.HEX.Value}"))
 		{

diff --git a/ColorPicker/Pages/SelectorPage.xaml.cs b/ColorPicker/Pages/SelectorPage.xaml.cs
@@ -319,6 +319,8 @@ internal void LoadDetails()
 		YuvTxt.Text = $"{ColorInfo.YUV.Y:0.00}..; {ColorInfo.YUV.U:0.00}..; {ColorInfo.YUV.V:0.00}..";
 		DecTxt.Text = ColorInfo.DEC.Value.ToString();
 
+		LoadBookmarkMenu();
+
 		// Load the bookmark icon
 		if (!Global.Bookmarks.ColorBookmarks.Contains(HexTxt.Text))
 		{