Add a new Converter

Sync back some Control changes.

Author: Wayfarer

CommonControls.Converter/BooleanToVisibilityConverter.cs

@@ -41,7 +41,6 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             if (value is bool b)
                 return b ? Visibility.Visible : (Collapse ? Visibility.Collapsed : Visibility.Hidden);
-
             return Visibility.Hidden;
         }
 
@@ -56,6 +55,6 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         /// A converted value. If the method returns <see langword="null" />, the valid null value is used.
         /// </returns>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => value is Visibility and Visibility.Visible;
+            => value is Visibility.Visible;
     }
-}
+}

CommonControls.Converter/ColorToNameConverter.cs

@@ -0,0 +1,70 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     CommonControls.Converter
+ * FILE:        ColorToNameConverter.cs
+ * PURPOSE:     Convert between Color and its name as string (e.g., "Red", "Blue", etc.) for WPF bindings.
+ * PROGRAMMER:  Peter Geinitz (Wayfarer)
+ */
+
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Linq;
+
+namespace CommonControls.Converters
+{
+    /// <summary>
+    /// Converter that converts between a Color and its name as a string for WPF bindings. It uses reflection to find the name of the color in System.Windows.Media.Colors when converting from Color to string, and uses ColorConverter to convert from string to Color.
+    /// </summary>
+    /// <seealso cref="System.Windows.Data.IValueConverter" />
+    public class ColorToNameConverter : IValueConverter
+    {
+        /// <summary>
+        /// Convert from Color (ViewModel) to string (Control)
+        /// </summary>
+        /// <param name="value">The value produced by the binding source.</param>
+        /// <param name="targetType">The type of the binding target property.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// A converted value. If the method returns <see langword="null" />, the valid null value is used.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is Color color)
+            {
+                // Find the name of the color in System.Windows.Media.Colors
+                var colorProperty = typeof(Colors).GetProperties()
+                    .FirstOrDefault(p => (Color)p.GetValue(null, null) == color);
+
+                return colorProperty?.Name ?? color.ToString();
+            }
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Convert from string (Control) to Color (ViewModel)
+        /// </summary>
+        /// <param name="value">The value that is produced by the binding target.</param>
+        /// <param name="targetType">The type to convert to.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// A converted value. If the method returns <see langword="null" />, the valid null value is used.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string colorName && !string.IsNullOrEmpty(colorName))
+            {
+                try
+                {
+                    return ColorConverter.ConvertFromString(colorName);
+                }
+                catch { return Colors.Transparent; }
+            }
+            return Colors.Transparent;
+        }
+    }
+}

CommonControls.Converter/EnumToBooleanConverter.cs

@@ -50,8 +50,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         {
             if ((bool)value)
                 return Enum.Parse(targetType, parameter.ToString()!);
-
             return Binding.DoNothing;
         }
     }
-}
+}

CommonControls.Converter/NotNullToBooleanConverter.cs

@@ -44,4 +44,4 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
             => Binding.DoNothing;
     }
-}
+}

CommonControls.Converter/NullToVisibilityConverter.cs

@@ -53,4 +53,4 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
             => Binding.DoNothing;
     }
-}
+}

CommonControls.Images/ColorPick.cs

@@ -64,13 +64,6 @@ public enum Area
         /// </summary>
         private static int OuterRadius => ColorPickerRegister.Size / 2;
 
-        internal static void Initiate(double h, double s, double v)
-        {
-            _sat = s;
-            _val = v;
-            _hue = h;
-        }
-
         /// <summary>
         ///     Hue might be changed. Redraw the Circle and change up Hue.
         /// </summary>

CommonControls.Images/ColorSelection.xaml.cs

@@ -53,6 +53,7 @@ public sealed partial class ColorSelection
         public ColorSelection()
         {
             InitializeComponent();
+            Loaded += (s, e) => Initiate(); // Ensure UI elements exist
         }
 
         /// <inheritdoc />
@@ -62,8 +63,8 @@ public ColorSelection()
         /// <param name="color">The color.</param>
         public ColorSelection(string color)
         {
-            StartColor = color;
             InitializeComponent();
+            StartColor = color;
         }
 
         /// <summary>
@@ -75,7 +76,6 @@ public string StartColor
             set
             {
                 SetValue(StartColorProperty, value);
-                SwitchColor();
             }
         }
 
@@ -105,24 +105,16 @@ private void ColorSelection_Loaded(object sender, RoutedEventArgs e)
         /// </summary>
         private void Initiate()
         {
-            //Generate Color Dictionary
-            _colorDct = InitiateColors();
+            var properties = typeof(Colors).GetProperties();
+            _colorDct = properties.ToDictionary(
+                p => p.Name,
+                p => (Color)p.GetValue(null, null)
+            );
 
-            try
-            {
-                //Fill the ComboBox
-                CmbColor.ItemsSource = typeof(Colors).GetProperties();
-                //Generate Color Dictionary
-                _colorDct = InitiateColors();
-                //Generate a possible List of Colors we can use from Code
-                ColorPalette = _colorDct.Keys.ToList();
+            CmbColor.ItemsSource = properties;
+            ColorPalette = _colorDct.Keys.ToList();
 
-                SwitchToStartColor();
-            }
-            catch (ArgumentException ex)
-            {
-                ShowErrorMessageBox(ComCtlResources.ErrorInitializingColorSelection, ex);
-            }
+            SwitchToStartColor();
         }
 
         /// <summary>
@@ -187,9 +179,18 @@ private static Dictionary<string, Color> InitiateColors()
         /// </summary>
         private void SwitchToStartColor()
         {
-            if (string.IsNullOrEmpty(StartColor)) return;
+            // Safety check: if the dictionary isn't built or ComboBox isn't ready, bail.
+            if (string.IsNullOrEmpty(StartColor) || _colorDct == null || CmbColor == null)
+            {
+                return;
+            }
 
-            CmbColor.SelectedItem = typeof(Colors).GetProperty(StartColor);
+            // Use the dictionary to find the property info to ensure consistency
+            var property = typeof(Colors).GetProperty(StartColor);
+            if (property != null)
+            {
+                CmbColor.SelectedItem = property;
+            }
         }
 
         /// <summary>