Merge pull request #4408 from Jaex/master

fixed #4385: Added color name label to color picker tool
ShareX · Oct 3, 2019 · f438161 · f438161
2 parents 05c6edc + a3573fd
commit f438161
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 72 deletions.
diff --git a/ShareX.HelpersLib/Forms/ColorPickerForm.Designer.cs b/ShareX.HelpersLib/Forms/ColorPickerForm.Designer.cs
diff --git a/ShareX.HelpersLib/Forms/ColorPickerForm.cs b/ShareX.HelpersLib/Forms/ColorPickerForm.cs
@@ -210,6 +210,9 @@ private void UpdateControls(MyColor color, ColorType type)
                 txtDecimal.Text = ColorHelpers.ColorToDecimal(color).ToString();
             }
 
+            Color knownColor = ColorHelpers.FindClosestKnownColor(color);
+            lblNameValue.Text = Helpers.GetProperName(knownColor.Name);
+
             controlChangingColor = false;
         }