Refactor Controls Part 1

Author: ghost1372

src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs

@@ -4,10 +4,10 @@
 namespace HandyControl.Controls;
 
 /// <summary>
-///     规则ItemsControl
+///     Rule ItemsControl
 /// </summary>
 /// <remarks>
-///     该类的每一项都具有相同的大小和外边距
+///     Each item in this category has the same size and margin
 /// </remarks>
 public class RegularItemsControl : SimpleItemsControl
 {

src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs

@@ -10,7 +10,7 @@
 namespace HandyControl.Controls;
 
 /// <summary>
-///     ItemsControl的轻量级版本
+///     Lightweight version of ItemsControl
 /// </summary>
 [DefaultProperty("Items")]
 [ContentProperty("Items")]

src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Shapes;
 using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
@@ -12,63 +14,110 @@ internal class ColorDropper
 {
     private bool _cursorIsSetted;
 
-    private Cursor _dropperCursor;
-
     private readonly ColorPicker _colorPicker;
 
+    Window window;
+    Rectangle rect;
+    TextBlock txtHex;
     public ColorDropper(ColorPicker colorPicker)
     {
         _colorPicker = colorPicker;
     }
 
-    public void Update(bool isShow)
+    private void DrawPreviewWindow()
     {
-        if (isShow)
+        window = new Window
         {
-            if (_dropperCursor == null)
-            {
-                var info = Application.GetResourceStream(new Uri("pack://application:,,,/HandyControl;Component/Resources/dropper.cur"));
-                if (info != null)
-                {
-                    _dropperCursor = new Cursor(info.Stream);
-                }
-            }
+            ShowInTaskbar = false,
+            Width = 100,
+            Height = 125,
+            ResizeMode = ResizeMode.NoResize,
+            WindowStyle = WindowStyle.None,
+            Background = Brushes.Transparent,
+            AllowsTransparency = true,
+            BorderThickness = new Thickness(0),
+            Title = "XColorDropperWindowX"
+        };
+        Border border = new Border
+        {
+            BorderThickness = new Thickness(1),
+            BorderBrush = ResourceHelper.GetResource<Brush>(ResourceToken.BorderBrush),
+            Background = ResourceHelper.GetResource<Brush>(ResourceToken.SecondaryRegionBrush),
+            CornerRadius = new CornerRadius(6)
+        };
+
+        rect = new Rectangle
+        {
+            Margin = new Thickness(5),
+            Stretch = Stretch.UniformToFill
+        };
+
+        txtHex = new TextBlock()
+        {
+            Margin = new Thickness(0, 0, 0, 10),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Foreground = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush),
+            FontSize = 14
+        };
 
-            if (_dropperCursor == null) return;
+        var panel = new StackPanel();
+        panel.Children.Add(rect);
+        panel.Children.Add(txtHex);
+        border.Child = panel;
+        window.Content = border;
+        window.Show();
+    }
 
+    public void Update(bool isShow)
+    {
+        if (isShow)
+        {
+            Mouse.OverrideCursor = Cursors.Cross;
             MouseHook.Start();
             MouseHook.StatusChanged += MouseHook_StatusChanged;
+            DrawPreviewWindow();
+            MoveWindowNextToMouse();
         }
         else
         {
             Mouse.OverrideCursor = Cursors.Arrow;
             MouseHook.Stop();
             MouseHook.StatusChanged -= MouseHook_StatusChanged;
+            ColorPicker.IsCheckedToggleButtonDropper(false);
+            window?.Close();
         }
     }
 
-    private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
+    private void MoveWindowNextToMouse()
     {
-        var window = System.Windows.Window.GetWindow(_colorPicker);
-        if (window == null)
-        {
-            UpdateCursor(false);
+        string title;
+        IntPtr handle;
 
+        InteropMethods.FindWindowTitleMatch(window.Title, out handle, out title);
+        if (handle == IntPtr.Zero)
+        {
             return;
         }
 
-        if (!_colorPicker.IsMouseOver && window.IsMouseOver)
-        {
-            UpdateCursor(true);
-            if (e.MessageType == MouseHookMessageType.LeftButtonDown)
-            {
-                var brush = new SolidColorBrush(GetColorAt(e.Point.X, e.Point.Y));
-                _colorPicker.SelectedBrush = brush;
-            }
-        }
-        else
+        // Restore the window.
+        InteropMethods.SetWindowPlacement(handle, InteropValues.ShowWindowCommands.Restore);
+
+        var position = InteropMethods.GetCursorPos();
+        InteropMethods.SetWindowPos(handle, IntPtr.Zero, (int) position.X - 20, (int) position.Y - -20, 0, 0, (int) InteropValues.SetWindowPosFlags.IgnoreZOrder | (int) InteropValues.SetWindowPosFlags.IgnoreResize | (int) InteropValues.SetWindowPosFlags.ShowWindow);
+    }
+    private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
+    {
+        UpdateCursor(true);
+        var brush = new SolidColorBrush(GetColorAt(e.Point.X, e.Point.Y));
+        _colorPicker.SelectedBrush = brush;
+        rect.Fill = brush;
+        txtHex.Text = ColorHelper.GetHexFromBrush(brush).ToUpper();
+        MoveWindowNextToMouse();
+        if (e.MessageType == MouseHookMessageType.LeftButtonDown)
         {
             UpdateCursor(false);
+            Update(false);
         }
     }
 
@@ -80,7 +129,7 @@ private void UpdateCursor(bool isDropper)
 
             if (!_cursorIsSetted)
             {
-                Mouse.OverrideCursor = _dropperCursor;
+                Mouse.OverrideCursor = Cursors.Cross;
                 _cursorIsSetted = true;
             }
         }

src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs

@@ -14,7 +14,7 @@
 namespace HandyControl.Controls;
 
 /// <summary>
-///     颜色拾取器
+///     Color picker
 /// </summary>
 [TemplatePart(Name = ElementBorderColor, Type = typeof(Border))]
 [TemplatePart(Name = ElementBorderPicker, Type = typeof(Border))]
@@ -26,6 +26,7 @@ namespace HandyControl.Controls;
 [TemplatePart(Name = ElementButtonDropper, Type = typeof(ToggleButton))]
 public class ColorPicker : Control, ISingleOpen
 {
+    internal static ColorPicker cPicker;
     #region Constants
 
     private const string ElementBorderColor = "PART_BorderColor";
@@ -64,42 +65,42 @@ public class ColorPicker : Control, ISingleOpen
     private bool _disposed;
 
     /// <summary>
-    ///     当前显示的颜色类型
+    ///     The type of color currently displayed
     /// </summary>
     private int _colorType;
 
     /// <summary>
-    ///     是否已经加载控件
+    ///     Whether the control has been loaded
     /// </summary>
     private bool _isLoaded;
 
     /// <summary>
-    ///     是否需要更新小球位置
+    ///     Do you need to update the ball position
     /// </summary>
     private bool _isNeedUpdatePicker = true;
 
     /// <summary>
-    ///     是否在拖动小球
+    ///     Whether you are dragging the ball
     /// </summary>
     private bool _isOnDragging;
 
     /// <summary>
-    ///     是否需要更新信息
+    ///     Need to update information
     /// </summary>
     private bool IsNeedUpdateInfo { get; set; } = true;
 
     /// <summary>
-    ///     颜色选取面板宽度
+    ///     Color selection panel width
     /// </summary>
     private const double ColorPanelWidth = 230;
 
     /// <summary>
-    ///     颜色选取面板高度
+    ///     Color selection panel height
     /// </summary>
     private const double ColorPanelHeight = 122;
 
     /// <summary>
-    ///     预设的颜色（一共18个，两行）
+    ///     Preset colors (a total of 18, two rows)
     /// </summary>
     private readonly List<string> _colorPresetList = new()
     {
@@ -125,7 +126,7 @@ public class ColorPicker : Control, ISingleOpen
     };
 
     /// <summary>
-    ///     颜色范围集合
+    ///     Color range collection
     /// </summary>
     private readonly List<ColorRange> _colorRangeList = new()
     {
@@ -162,7 +163,7 @@ public class ColorPicker : Control, ISingleOpen
     };
 
     /// <summary>
-    ///     颜色分隔集合
+    ///     Color separated collection
     /// </summary>
     private readonly List<Color> _colorSeparateList = new()
     {
@@ -189,14 +190,14 @@ public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
     }
 
     /// <summary>
-    ///     颜色改变事件
+    ///     Color change event
     /// </summary>
     public static readonly RoutedEvent ConfirmedEvent =
         EventManager.RegisterRoutedEvent("Confirmed", RoutingStrategy.Bubble,
             typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
 
     /// <summary>
-    ///     颜色改变事件
+    ///     Color change event
     /// </summary>
     public event EventHandler<FunctionEventArgs<Color>> Confirmed
     {
@@ -205,14 +206,14 @@ public event EventHandler<FunctionEventArgs<Color>> Confirmed
     }
 
     /// <summary>
-    ///     取消事件
+    ///     Cancel event
     /// </summary>
     public static readonly RoutedEvent CanceledEvent =
         EventManager.RegisterRoutedEvent("Canceled", RoutingStrategy.Bubble,
             typeof(EventHandler), typeof(ColorPicker));
 
     /// <summary>
-    ///     取消事件
+    ///     Cancel event
     /// </summary>
     public event EventHandler Canceled
     {
@@ -291,7 +292,7 @@ private static void OnSelectedBrushChanged(DependencyObject d, DependencyPropert
     }
 
     /// <summary>
-    ///     当前选中的颜色
+    ///     Currently selected color
     /// </summary>
     public SolidColorBrush SelectedBrush
     {
@@ -332,7 +333,7 @@ internal List<bool> ShowList
     #endregion Properties
 
     /// <summary>
-    ///     当前显示的颜色类型
+    ///     The type of color currently displayed
     /// </summary>
     private int ColorType
     {
@@ -381,6 +382,8 @@ public ColorPicker()
                 _isLoaded = true;
             }
         };
+
+        cPicker = this;
     }
 
     public override void OnApplyTemplate()
@@ -450,7 +453,7 @@ public override void OnApplyTemplate()
     }
 
     /// <summary>
-    ///     初始化
+    ///     initialization
     /// </summary>
     private void Init()
     {
@@ -464,7 +467,7 @@ private void Init()
     }
 
     /// <summary>
-    ///     创建颜色按钮
+    ///     Create color buttons
     /// </summary>
     /// <returns></returns>
     private Button CreateColorButton(string colorStr)
@@ -495,7 +498,7 @@ private Button CreateColorButton(string colorStr)
     }
 
     /// <summary>
-    ///     内部更新
+    ///     Internal update
     /// </summary>
     private void UpdateStatus(Color color)
     {
@@ -634,7 +637,7 @@ private void MouseDragElementBehavior_OnDragging(object sender, MouseEventArgs e
     }
 
     /// <summary>
-    ///     拖动时更新颜色
+    ///     Update color while dragging
     /// </summary>
     private void UpdateColorWhenDrag(Point p)
     {
@@ -739,4 +742,9 @@ public void Dispose()
     }
 
     public bool CanDispose => true;
+
+    public static void IsCheckedToggleButtonDropper(bool value)
+    {
+        ColorPicker.cPicker._toggleButtonDropper.IsChecked = value;
+    }
 }