Added the possibility to toggle highlight (#398)

Leo-Corporation · Mar 17, 2024 · ba61f41 · ba61f41
1 parent 80d47cf
commit ba61f41
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 23 deletions.
diff --git a/ColorPicker/Pages/ContrastPage.xaml b/ColorPicker/Pages/ContrastPage.xaml
@@ -430,6 +430,15 @@
                 Foreground="{DynamicResource AccentColor}"
                 GroupName="ScoreToggles"
                 Style="{DynamicResource DefaultToggleButton}" />
+            <CheckBox
+                x:Name="ShowHighlight"
+                VerticalContentAlignment="Center"
+                BorderThickness="2"
+                Checked="ShowHighlight_Checked"
+                Content="{x:Static lang:Resources.HighlightColorGrid}"
+                Foreground="{DynamicResource Foreground1}"
+                Style="{DynamicResource CheckBoxStyle1}"
+                Unchecked="ShowHighlight_Checked" />
         </StackPanel>
         <Grid x:Name="ContrastGrid" Grid.Row="3">
             <Grid.ColumnDefinitions>

diff --git a/ColorPicker/Pages/ContrastPage.xaml.cs b/ColorPicker/Pages/ContrastPage.xaml.cs
@@ -409,31 +409,34 @@ internal void InitGrid(double limit)
 		}
 
 
-		Border ColBorder = new()
+		if (ShowHighlight.IsChecked ?? false)
 		{
-			Name = "ColBorder",
-			BorderBrush = Global.GetColorFromResource("AccentColor"),
-			BorderThickness = new Thickness(2),
-			CornerRadius = new CornerRadius(5)
-		};
+			Border ColBorder = new()
+			{
+				Name = "ColBorder",
+				BorderBrush = Global.GetColorFromResource("AccentColor"),
+				BorderThickness = new Thickness(2),
+				CornerRadius = new CornerRadius(5)
+			};
 
-		Border RowBorder = new()
-		{
-			Name = "RowBorder",
-			BorderBrush = Global.GetColorFromResource("AccentColor"),
-			BorderThickness = new Thickness(2),
-			CornerRadius = new CornerRadius(5)
-		};
-
-		Grid.SetColumn(ColBorder, 11-lumValues.IndexOf(ColorInfo.HSL.L) );
-		Grid.SetRow(RowBorder, 11-lumValues.IndexOf(ColorInfo.HSL.L));
-		Grid.SetRowSpan(ColBorder, 12);
-		Grid.SetColumnSpan(RowBorder, 12);
-		Panel.SetZIndex(ColBorder, 10);
-		Panel.SetZIndex(RowBorder, 10);
-
-		ContrastGrid.Children.Add(ColBorder);
-		ContrastGrid.Children.Add(RowBorder);
+			Border RowBorder = new()
+			{
+				Name = "RowBorder",
+				BorderBrush = Global.GetColorFromResource("AccentColor"),
+				BorderThickness = new Thickness(2),
+				CornerRadius = new CornerRadius(5)
+			};
+
+			Grid.SetColumn(ColBorder, 11 - lumValues.IndexOf(ColorInfo.HSL.L));
+			Grid.SetRow(RowBorder, 11 - lumValues.IndexOf(ColorInfo.HSL.L));
+			Grid.SetRowSpan(ColBorder, 12);
+			Grid.SetColumnSpan(RowBorder, 12);
+			Panel.SetZIndex(ColBorder, 10);
+			Panel.SetZIndex(RowBorder, 10);
+
+			ContrastGrid.Children.Add(ColBorder);
+			ContrastGrid.Children.Add(RowBorder); 
+		}
 
 		// Load the bookmark icon
 		if (!Global.Bookmarks.ColorBookmarks.Contains($"#{ColorInfo.HEX.Value}"))
@@ -463,4 +466,9 @@ private void ScoreAAAToggle_Checked(object sender, RoutedEventArgs e)
 		contrastLimit = 7;
 		InitGrid(contrastLimit);
 	}
+
+	private void ShowHighlight_Checked(object sender, RoutedEventArgs e)
+	{
+		InitGrid(contrastLimit);
+	}
 }
diff --git a/ColorPicker/Properties/Resources.Designer.cs b/ColorPicker/Properties/Resources.Designer.cs
diff --git a/ColorPicker/Properties/Resources.en-US.resx b/ColorPicker/Properties/Resources.en-US.resx
@@ -744,4 +744,7 @@
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="HighlightColorGrid" xml:space="preserve">
+    <value>Highlight color</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.fr-FR.resx b/ColorPicker/Properties/Resources.fr-FR.resx
@@ -748,4 +748,7 @@
   <data name="Save" xml:space="preserve">
     <value>Enregistrer</value>
   </data>
+  <data name="HighlightColorGrid" xml:space="preserve">
+    <value>Mettre en évidence la couleur</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.resx b/ColorPicker/Properties/Resources.resx
@@ -724,4 +724,7 @@
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="HighlightColorGrid" xml:space="preserve">
+    <value>Highlight color</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.zh-CN.resx b/ColorPicker/Properties/Resources.zh-CN.resx
@@ -752,4 +752,7 @@
   <data name="Save" xml:space="preserve">
     <value>节省</value>
   </data>
+  <data name="HighlightColorGrid" xml:space="preserve">
+    <value>高光颜色</value>
+  </data>
 </root>