418 gui design highlighting unreadable color

src/LogExpert.Core/Config/ColorEntry.cs

@@ -7,23 +7,9 @@
 namespace LogExpert.Core.Config;
 
 [Serializable]
-public class ColorEntry
+public class ColorEntry (string FileName, Color Color)
 {
-    #region cTor
+    public Color Color { get; } = Color;
 
-    public ColorEntry(string fileName, Color color)
-    {
-        FileName = fileName;
-        Color = color;
-    }
-
-    #endregion
-
-    public Color Color { get; }
-
-    public string FileName { get; }
-
-    #region Fields
-
-    #endregion
+    public string FileName { get; } = FileName;
 }

src/LogExpert.Core/EventArguments/BookmarkEventArgs.cs

@@ -1,12 +1,21 @@
-using LogExpert.Core.Entities;
+using LogExpert.Core.Entities;
 
 namespace LogExpert.Core.EventArguments;
 
-public class BookmarkEventArgs(Bookmark bookmark) : System.EventArgs
+public class BookmarkEventArgs : EventArgs
 {
+    public BookmarkEventArgs (Bookmark bookmark)
+    {
+        Bookmark = bookmark;
+    }
+
+    public BookmarkEventArgs () { }
+
+    public static new readonly BookmarkEventArgs Empty = new();
+
     #region Properties
 
-    public Bookmark Bookmark { get; } = bookmark;
+    public Bookmark Bookmark { get; }
 
     #endregion
 }

src/LogExpert.Core/EventHandlers/EventHandlers.cs

@@ -1,7 +1,7 @@
-using LogExpert.Core.Entities;
+using LogExpert.Core.Entities;
 using LogExpert.Core.EventArguments;
 
 namespace LogExpert.Core.EventHandlers;
 
-public delegate void ConfigChangedEventHandler(object sender, ConfigChangedEventArgs e);
-public delegate void FileSizeChangedEventHandler(object sender, LogEventArgs e);
+public delegate void ConfigChangedEventHandler (object sender, ConfigChangedEventArgs e);
+public delegate void FileSizeChangedEventHandler (object sender, LogEventArgs e);

src/LogExpert.UI/Controls/BufferedDataGridView.cs

@@ -17,13 +17,13 @@ internal partial class BufferedDataGridView : DataGridView
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
     private readonly Brush _brush;
 
-    private readonly Color _bubbleColor = Color.FromArgb(160, 250, 250, 0);
+    private readonly Color _bubbleColor = Color.FromArgb(160, 250, 250, 0); //yellow
     private readonly Font _font = new("Arial", 10);
 
     private readonly SortedList<int, BookmarkOverlay> _overlayList = [];
 
     private readonly Pen _pen;
-    private readonly Brush _textBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90));
+    private readonly Brush _textBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90)); //dark blue
 
     private BookmarkOverlay _draggedOverlay;
     private Point _dragStartPoint;
@@ -46,15 +46,9 @@ public BufferedDataGridView ()
 
     #endregion
 
-    #region Delegates
-
-    public delegate void OverlayDoubleClickedEventHandler (object sender, OverlayEventArgs e);
-
-    #endregion
-
     #region Events
 
-    public event OverlayDoubleClickedEventHandler OverlayDoubleClicked;
+    public event EventHandler<OverlayEventArgs> OverlayDoubleClicked;
 
     #endregion
 
@@ -112,15 +106,15 @@ protected override void OnEditingControlShowing (DataGridViewEditingControlShowi
         e.Control.KeyDown -= OnControlKeyDown;
         e.Control.KeyDown += OnControlKeyDown;
         var editControl = (DataGridViewTextBoxEditingControl)e.Control;
-        e.Control.PreviewKeyDown -= Control_PreviewKeyDown;
-        e.Control.PreviewKeyDown += Control_PreviewKeyDown;
+        e.Control.PreviewKeyDown -= OnControlPreviewKeyDown;
+        e.Control.PreviewKeyDown += OnControlPreviewKeyDown;
 
         editControl.ContextMenuStrip = EditModeMenuStrip;
     }
 
     protected override void OnMouseDown (MouseEventArgs e)
     {
-        BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+        var overlay = GetOverlayForPosition(e.Location);
         if (overlay != null)
         {
             if (e.Button == MouseButtons.Right)
@@ -171,15 +165,15 @@ protected override void OnMouseMove (MouseEventArgs e)
         }
         else
         {
-            BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+            var overlay = GetOverlayForPosition(e.Location);
             Cursor = overlay != null ? Cursors.Hand : Cursors.Default;
             base.OnMouseMove(e);
         }
     }
 
     protected override void OnMouseDoubleClick (MouseEventArgs e)
     {
-        BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
+        var overlay = GetOverlayForPosition(e.Location);
         if (overlay != null)
         {
             if (e.Button == MouseButtons.Left)
@@ -201,7 +195,7 @@ private BookmarkOverlay GetOverlayForPosition (Point pos)
     {
         lock (_overlayList)
         {
-            foreach (BookmarkOverlay overlay in _overlayList.Values)
+            foreach (var overlay in _overlayList.Values)
             {
                 if (overlay.BubbleRect.Contains(pos))
                 {
@@ -215,9 +209,9 @@ private BookmarkOverlay GetOverlayForPosition (Point pos)
 
     private void PaintOverlays (PaintEventArgs e)
     {
-        BufferedGraphicsContext currentContext = BufferedGraphicsManager.Current;
+        var currentContext = BufferedGraphicsManager.Current;
 
-        using BufferedGraphics myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle);
+        using var myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle);
         lock (_overlayList)
         {
             _overlayList.Clear();
@@ -246,9 +240,9 @@ private void PaintOverlays (PaintEventArgs e)
 
         lock (_overlayList)
         {
-            foreach (BookmarkOverlay overlay in _overlayList.Values)
+            foreach (var overlay in _overlayList.Values)
             {
-                SizeF textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
+                var textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
                 Rectangle rectBubble = new(overlay.Position, new Size((int)textSize.Width, (int)textSize.Height));
                 rectBubble.Offset(60, -(rectBubble.Height + 40));
                 rectBubble.Inflate(3, 3);
@@ -277,7 +271,7 @@ private void PaintOverlays (PaintEventArgs e)
 
     #region Events handler
 
-    private void Control_PreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
+    private void OnControlPreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
     {
         if ((e.KeyCode == Keys.C || e.KeyCode == Keys.Insert) && e.Control)
         {
@@ -290,7 +284,7 @@ private void Control_PreviewKeyDown (object sender, PreviewKeyDownEventArgs e)
 
     private void OnControlKeyDown (object sender, KeyEventArgs e)
     {
-        if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
+        if (e.KeyCode is Keys.Up or Keys.Down)
         {
             if (EditingControl != null)
             {

src/LogExpert.UI/Controls/ColorComboBox.cs

@@ -1,4 +1,4 @@
-using System.Drawing.Drawing2D;
+using System.Drawing.Drawing2D;
 using System.Runtime.Versioning;
 
 namespace LogExpert.UI.Controls;
@@ -14,31 +14,34 @@ internal class ColorComboBox : ComboBox
 
     #region cTor
 
-    public ColorComboBox()
+    public ColorComboBox ()
     {
         DrawMode = DrawMode.OwnerDrawFixed;
         DrawItem += OnColorComboBoxDrawItem;
-        // add color presets
         if (!DesignMode)
         {
-            Items.Add(_customColor);
-            Items.Add(Color.Black);
-            Items.Add(Color.White);
-            Items.Add(Color.Gray);
-            Items.Add(Color.DarkGray);
-            Items.Add(Color.Blue);
-            Items.Add(Color.LightBlue);
-            Items.Add(Color.DarkBlue);
-            Items.Add(Color.Green);
-            Items.Add(Color.LightGreen);
-            Items.Add(Color.DarkGreen);
-            Items.Add(Color.Olive);
-            Items.Add(Color.Red);
-            Items.Add(Color.Pink);
-            Items.Add(Color.Purple);
-            Items.Add(Color.IndianRed);
-            Items.Add(Color.DarkCyan);
-            Items.Add(Color.Yellow);
+            Items.AddRange(
+                [
+                    _customColor,
+                    Color.Black,
+                    Color.White,
+                    Color.Gray,
+                    Color.DarkGray,
+                    Color.Blue,
+                    Color.LightBlue,
+                    Color.DarkBlue,
+                    Color.Green,
+                    Color.LightGreen,
+                    Color.DarkGreen,
+                    Color.Olive,
+                    Color.Red,
+                    Color.Pink,
+                    Color.Purple,
+                    Color.IndianRed,
+                    Color.DarkCyan,
+                    Color.Yellow
+                ]
+            );
         }
     }
 
@@ -63,7 +66,7 @@ public Color CustomColor
 
     #region Events handler
 
-    private void OnColorComboBoxDrawItem(object sender, DrawItemEventArgs e)
+    private void OnColorComboBoxDrawItem (object sender, DrawItemEventArgs e)
     {
         e.DrawBackground();
         if (e.Index >= 0)