cleanup and format

Author: LoneWandererProductions

CommonControls.Converter/BooleanToVisibilityConverter.cs

@@ -41,6 +41,7 @@ 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;
         }
 
@@ -55,6 +56,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 v && v == Visibility.Visible;
+            => value is Visibility and Visibility.Visible;
     }
 }

CommonControls.Converter/EnumToBooleanConverter.cs

@@ -50,6 +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.Images/ColorPicker.xaml

@@ -27,13 +27,13 @@
                   Background="Transparent"
                   HorizontalAlignment="Center"
                   VerticalAlignment="Center"
-                  MouseDown="OnMouseDown" 
-                  MouseMove="OnMouseMove" 
+                  MouseDown="OnMouseDown"
+                  MouseMove="OnMouseMove"
                   MouseUp="OnMouseUp">
 
-                <Image x:Name="PickerImage" 
+                <Image x:Name="PickerImage"
                        RenderOptions.BitmapScalingMode="HighQuality"
-                       IsHitTestVisible="False"/>
+                       IsHitTestVisible="False" />
 
                 <Canvas x:Name="CursorCanvas" IsHitTestVisible="False">
                     <Ellipse x:Name="HueCursor" Width="10" Height="10"
@@ -65,10 +65,10 @@
                     Value="{Binding Alpha, ElementName=ColorPickerControl, Mode=TwoWay}"
                     HorizontalAlignment="Center" />
 
-            <TextBlock Grid.Row="1" 
-                       Text="{Binding Alpha, ElementName=ColorPickerControl}" 
-                       HorizontalAlignment="Center" 
-                       Width="30" 
+            <TextBlock Grid.Row="1"
+                       Text="{Binding Alpha, ElementName=ColorPickerControl}"
+                       HorizontalAlignment="Center"
+                       Width="30"
                        TextAlignment="Center"
                        Margin="0,5,0,0" />
         </Grid>
@@ -93,27 +93,27 @@
             </Grid.RowDefinitions>
 
             <Label Grid.Row="0" Grid.Column="0" Content="Hue" Padding="0" />
-            <TextBox Grid.Row="1" Grid.Column="0" 
+            <TextBox Grid.Row="1" Grid.Column="0"
                      Text="{Binding Hue, ElementName=ColorPickerControl, StringFormat=N1, UpdateSourceTrigger=PropertyChanged, Delay=300}" />
 
             <Label Grid.Row="0" Grid.Column="2" Content="Sat" Padding="0" />
-            <TextBox Grid.Row="1" Grid.Column="2" 
+            <TextBox Grid.Row="1" Grid.Column="2"
                      Text="{Binding Sat, ElementName=ColorPickerControl, StringFormat=N2, UpdateSourceTrigger=PropertyChanged, Delay=300}" />
 
             <Label Grid.Row="0" Grid.Column="4" Content="Val" Padding="0" />
-            <TextBox Grid.Row="1" Grid.Column="4" 
+            <TextBox Grid.Row="1" Grid.Column="4"
                      Text="{Binding Val, ElementName=ColorPickerControl, StringFormat=N2, UpdateSourceTrigger=PropertyChanged, Delay=300}" />
 
             <Label Grid.Row="3" Grid.Column="0" Content="R" Padding="0" />
-            <TextBox Grid.Row="4" Grid.Column="0" 
+            <TextBox Grid.Row="4" Grid.Column="0"
                      Text="{Binding R, ElementName=ColorPickerControl, UpdateSourceTrigger=PropertyChanged}" />
 
             <Label Grid.Row="3" Grid.Column="2" Content="G" Padding="0" />
-            <TextBox Grid.Row="4" Grid.Column="2" 
+            <TextBox Grid.Row="4" Grid.Column="2"
                      Text="{Binding G, ElementName=ColorPickerControl, UpdateSourceTrigger=PropertyChanged}" />
 
             <Label Grid.Row="3" Grid.Column="4" Content="B" Padding="0" />
-            <TextBox Grid.Row="4" Grid.Column="4" 
+            <TextBox Grid.Row="4" Grid.Column="4"
                      Text="{Binding B, ElementName=ColorPickerControl, UpdateSourceTrigger=PropertyChanged}" />
 
             <TextBox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="5"

CommonControls.Images/ColorPicker.xaml.cs

@@ -1,4 +1,12 @@
-using System;
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     CommonControls.Images
+ * FILE:        ColorPicker.xaml.cs
+ * PURPOSE:     ColorPicker control with a hue ring and saturation/value triangle, supporting RGB/Hex input and output.
+ * PROGRAMER:   Peter Geinitz (Wayfarer)
+ */
+
+using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
@@ -10,7 +18,14 @@
 
 namespace CommonControls.Images
 {
-    public sealed partial class ColorPicker : UserControl, INotifyPropertyChanged
+    /// <inheritdoc cref="INotifyPropertyChanged" />
+    /// <summary>
+    /// ColorPicker is a WPF UserControl that provides an interactive color selection interface using a hue ring and saturation/value triangle. It supports RGB and Hex input/output, and raises events when the color changes. The control is designed to be visually intuitive and responsive, allowing users to easily select colors while providing real-time feedback through property bindings and events.
+    /// </summary>
+    /// <seealso cref="T:System.Windows.Controls.UserControl" />
+    /// <seealso cref="T:System.ComponentModel.INotifyPropertyChanged" />
+    /// <seealso cref="T:System.Windows.Markup.IComponentConnector" />
+    public sealed partial class ColorPicker : INotifyPropertyChanged
     {
         private WriteableBitmap _bitmap;
         private bool _isDragging;
@@ -24,22 +39,35 @@ public sealed partial class ColorPicker : UserControl, INotifyPropertyChanged
         // To prevent infinite loops when updating properties
         private bool _ignoreUpdates;
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        /// <inheritdoc />
+        /// <summary>
+        /// Occurs when a property value changes.
+        /// </summary>
+        public event PropertyChangedEventHandler? PropertyChanged;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="colorHsv">The color HSV.</param>
         public delegate void DelegateColor(ColorHsv colorHsv);
 
+        /// <summary>
+        /// Occurs when [color changed].
+        /// </summary>
         public event DelegateColor ColorChanged;
 
+        /// <inheritdoc />
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorPicker"/> class.
+        /// Initializes a new instance of the <see cref="T:CommonControls.Images.ColorPicker" /> class.
         /// </summary>
         public ColorPicker()
         {
             InitializeComponent();
         }
 
+        /// <inheritdoc />
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorPicker"/> class.
+        /// Initializes a new instance of the <see cref="T:CommonControls.Images.ColorPicker" /> class.
         /// </summary>
         /// <param name="r">The r.</param>
         /// <param name="g">The g.</param>
@@ -53,7 +81,8 @@ public ColorPicker()
             Alpha = alpha;
 
             // This is the trigger that will finally make it draw
-            this.SizeChanged += (s, e) => {
+            this.SizeChanged += (s, e) =>
+            {
                 if (e.NewSize.Width > 0 && e.NewSize.Height > 0)
                 {
                     RedrawAsync();
@@ -62,6 +91,7 @@ public ColorPicker()
             };
         }
 
+        /// <inheritdoc />
         /// <summary>
         /// When overridden in a derived class, participates in rendering operations that are directed by the layout system. The rendering instructions for this element are not used directly when this method is invoked, and are instead preserved for later asynchronous use by layout and drawing.
         /// </summary>
@@ -78,7 +108,9 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont
 
         // --- DEPENDENCY PROPERTIES (For Bindings) ---
 
-        // Show/Hide inputs
+        /// <summary>
+        /// Show/Hide inputs
+        /// </summary>
         public static readonly DependencyProperty ShowTextBoxesProperty =
             DependencyProperty.Register(nameof(ShowTextBoxes), typeof(bool), typeof(ColorPicker),
                 new PropertyMetadata(true));
@@ -276,14 +308,16 @@ private void ProcessMouse(Point p)
                 // Try exact math first
                 if (GetSvFromPoint(dx, dy, layout.InnerRadius, _h, out double s, out double v))
                 {
-                    _s = s; _v = v;
+                    _s = s;
+                    _v = v;
                 }
                 else
                 {
                     // MAGNET FIX: We are inside the circle, but outside the triangle.
                     // Snap to the closest edge (Clamp).
                     GetSvFromPointClamped(dx, dy, layout.InnerRadius, _h, out s, out v);
-                    _s = s; _v = v;
+                    _s = s;
+                    _v = v;
                 }
 
                 OnPropertyChanged(nameof(Sat));
@@ -340,7 +374,11 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
         // This is the "Magic" pixel drawer (Same as before)
         private void RedrawAsync()
         {
-            if (!CheckAccess()) { Dispatcher.BeginInvoke(new Action(RedrawAsync)); return; }
+            if (!CheckAccess())
+            {
+                Dispatcher.BeginInvoke(new Action(RedrawAsync));
+                return;
+            }
 
             // 1. Get the AVAILABLE space from the parent container (The Grid in Column 0)
             // We cast Parent to FrameworkElement to get its ActualWidth/Height
@@ -352,7 +390,7 @@ private void RedrawAsync()
             int size = (int)Math.Min(parent.ActualWidth, parent.ActualHeight);
 
             // 3. FORCE the Container to be this square size.
-            // Because we set Horizontal/VerticalAlignment="Center" in XAML, 
+            // Because we set Horizontal/VerticalAlignment="Center" in XAML,
             // it will float perfectly in the middle.
             PickerContainer.Width = size;
             PickerContainer.Height = size;
@@ -404,6 +442,7 @@ private void RedrawAsync()
                     }
                 }
             }
+
             _bitmap.AddDirtyRect(new Int32Rect(0, 0, size, size));
             _bitmap.Unlock();
         }
@@ -509,8 +548,8 @@ private static int HsvToInt(double h, double s, double v, int alpha)
             double c = size / 2.0;
 
             return (
-                CenterX: c,      // Defined X
-                CenterY: c,      // Defined Y (Same as X for a square)
+                CenterX: c, // Defined X
+                CenterY: c, // Defined Y (Same as X for a square)
                 Size: size,
                 Radius: c,
                 InnerRadius: c * 0.85
@@ -555,10 +594,10 @@ private void GetSvFromPointClamped(double x, double y, double r, double hue, out
         }
 
 
-
         private bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
         {
             if (System.Collections.Generic.EqualityComparer<T>.Default.Equals(field, value)) return false;
+
             field = value;
             OnPropertyChanged(propertyName);
             return true;
@@ -567,4 +606,4 @@ private bool SetField<T>(ref T field, T value, [CallerMemberName] string propert
         private void OnPropertyChanged(string propertyName) =>
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
-}
+}

CommonControls.Images/ImageZoom.xaml.cs

@@ -625,7 +625,7 @@ private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
 
                 // 3. Validation: Ensure we actually drew something substantial
                 bool isValid = (frame.Width > 0 && frame.Height > 0) ||
-                               (frame.Points != null && frame.Points.Count > 0);
+                               frame.Points is { Count: > 0 };
 
                 if (isValid)
                 {
@@ -732,7 +732,7 @@ private void Canvas_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
                 _mouseDown = false;
                 MainCanvas.ReleaseMouseCapture();
                 // Optional: reset current points in Adorner without committing
-                // SelectionAdorner.ResetCurrent(); 
+                // SelectionAdorner.ResetCurrent();
                 return;
             }
 
@@ -945,4 +945,4 @@ private static void SafeExecuteCommand(ICommand? cmd, object? parameter)
 
         #endregion
     }
-}
+}

CommonControls.Images/SelectionAdorner.cs

@@ -369,6 +369,7 @@ protected override void OnRender(DrawingContext drawingContext)
             foreach (var points in _committedFreeForms)
             {
                 if (points.Count <= 1) continue;
+
                 var geometry = new StreamGeometry();
                 using (var ctx = geometry.Open())
                 {
@@ -415,7 +416,7 @@ protected override void OnRender(DrawingContext drawingContext)
                 using (var ctx = geometry.Open())
                 {
                     // Current FreeFormPoints are already in View Coordinates (handled in OnMouseMove or AddFreeFormPoint logic)
-                    // Note: Check if your AddFreeFormPoint stores Transformed or View points. 
+                    // Note: Check if your AddFreeFormPoint stores Transformed or View points.
                     // Based on your original code: AddFreeFormPoint stores transformed (Logic Coordinates).
                     // So we must Inverse Transform them for display.
 
@@ -429,4 +430,4 @@ protected override void OnRender(DrawingContext drawingContext)
             }
         }
     }
-}
+}

CommonControls.Images/SelectionFrame.cs

@@ -49,4 +49,4 @@ public sealed class SelectionFrame
         /// </summary>
         public List<Point> Points { get; internal init; } = new();
     }
-}
+}

CommonControls.Images/Thumbnails.xaml.cs

@@ -674,6 +674,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                         bitmapImage.EndInit();
                         bitmapImage.Freeze(); // Crucial: Makes it accessible to the UI thread
                     }
+
                     return bitmapImage;
                 }
                 catch (Exception ex)
@@ -989,4 +990,4 @@ private void Dispose(bool disposing)
             Dispose(false);
         }
     }
-}
+}

CommonControls/GlobalKeyHandler.cs

@@ -32,7 +32,8 @@ public static class GlobalKeyHandler
         /// </summary>
         public static readonly DependencyProperty CommandBindingsProperty =
             DependencyProperty.RegisterAttached(
-                ComCtlResources.GlobalKeyCommandBindings, typeof(Dictionary<Tuple<ModifierKeys, Key>, ICommand>), typeof(GlobalKeyHandler),
+                ComCtlResources.GlobalKeyCommandBindings, typeof(Dictionary<Tuple<ModifierKeys, Key>, ICommand>),
+                typeof(GlobalKeyHandler),
                 new PropertyMetadata(null));
 
         /// <summary>
@@ -167,4 +168,4 @@ private static void OnPreviewKeyDown(object sender, KeyEventArgs e)
             e.Handled = true;
         }
     }
-}
+}

CommonControls/ThumbnailItem.cs

@@ -16,17 +16,26 @@ public class ThumbnailItem : INotifyPropertyChanged
         public BitmapSource ImageSource
         {
             get => _imageSource;
-            set { _imageSource = value; OnPropertyChanged(); }
+            set
+            {
+                _imageSource = value;
+                OnPropertyChanged();
+            }
         }
 
         // Two-way binding for the CheckBox
         public bool IsSelected
         {
             get => _isSelected;
-            set { _isSelected = value; OnPropertyChanged(); }
+            set
+            {
+                _isSelected = value;
+                OnPropertyChanged();
+            }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
+
         private void OnPropertyChanged([CallerMemberName] string name = null)
             => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
     }