updated unecessary castings from BufferedDataGridView to DataGridView

Author: Hirogen

src/LogExpert/Classes/PaintHelper.cs

@@ -32,15 +32,15 @@ internal class PaintHelper
 
         #region Public methods
 
-        public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridView, int rowIndex,
-            DataGridViewCellPaintingEventArgs e)
+        public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
         {
             if (rowIndex < 0 || e.ColumnIndex < 0)
             {
                 e.Handled = false;
                 return;
             }
             ILogLine line = logPaintCtx.GetLogLine(rowIndex);
+
             if (line != null)
             {
                 HilightEntry entry = logPaintCtx.FindHighlightEntry(line, true);
@@ -49,9 +49,10 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
                 {
                     Color backColor = e.CellStyle.SelectionBackColor;
                     Brush brush;
+
                     if (gridView.Focused)
                     {
-                        brush = new SolidBrush(e.CellStyle.SelectionBackColor);
+                        brush = new SolidBrush(backColor);
                     }
                     else
                     {
@@ -63,7 +64,8 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
                 }
                 else
                 {
-                    Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor;
+                    Color bgColor = ColorMode.DockBackgroundColor;
+
                     if (!DebugOptions.disableWordHighlight)
                     {
                         if (entry != null)
@@ -78,6 +80,7 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
                             bgColor = entry.BackgroundColor;
                         }
                     }
+
                     e.CellStyle.BackColor = bgColor;
                     e.PaintBackground(e.ClipBounds, false);
                 }
@@ -94,6 +97,7 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
                 if (e.ColumnIndex == 0)
                 {
                     Entities.Bookmark bookmark = logPaintCtx.GetBookmarkForLine(rowIndex);
+
                     if (bookmark != null)
                     {
                         Rectangle r; // = new Rectangle(e.CellBounds.Left + 2, e.CellBounds.Top + 2, 6, 6);
@@ -102,11 +106,15 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
                         Brush brush = new SolidBrush(logPaintCtx.BookmarkColor);
                         e.Graphics.FillRectangle(brush, r);
                         brush.Dispose();
+
                         if (bookmark.Text.Length > 0)
                         {
-                            StringFormat format = new();
-                            format.LineAlignment = StringAlignment.Center;
-                            format.Alignment = StringAlignment.Center;
+                            StringFormat format = new()
+                            {
+                                LineAlignment = StringAlignment.Center,
+                                Alignment = StringAlignment.Center
+                            };
+
                             Brush brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0));
                             Font font = logPaintCtx.MonospacedFont;
                             e.Graphics.DrawString("i", font, brush2, new RectangleF(r.Left, r.Top, r.Width, r.Height),
@@ -124,43 +132,49 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV
 
         public static DataGridViewTextBoxColumn CreateMarkerColumn()
         {
-            DataGridViewTextBoxColumn markerColumn = new();
-            markerColumn.HeaderText = "";
-            markerColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
-            markerColumn.Resizable = DataGridViewTriState.False;
-            markerColumn.DividerWidth = 1;
-            markerColumn.ReadOnly = true;
-            markerColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
+            DataGridViewTextBoxColumn markerColumn = new()
+            {
+                HeaderText = "",
+                AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
+                Resizable = DataGridViewTriState.False,
+                DividerWidth = 1,
+                ReadOnly = true,
+                SortMode = DataGridViewColumnSortMode.NotSortable
+            };
 
             return markerColumn;
         }
 
         public static DataGridViewTextBoxColumn CreateLineNumberColumn()
         {
-            DataGridViewTextBoxColumn lineNumberColumn = new();
-            lineNumberColumn.HeaderText = "Line";
-            lineNumberColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
-            lineNumberColumn.Resizable = DataGridViewTriState.NotSet;
-            lineNumberColumn.DividerWidth = 1;
-            lineNumberColumn.ReadOnly = true;
-            lineNumberColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
+            DataGridViewTextBoxColumn lineNumberColumn = new()
+            {
+                HeaderText = "Line",
+                AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
+                Resizable = DataGridViewTriState.NotSet,
+                DividerWidth = 1,
+                ReadOnly = true,
+                SortMode = DataGridViewColumnSortMode.NotSortable
+            };
 
             return lineNumberColumn;
         }
 
         public static DataGridViewColumn CreateTitleColumn(string colName)
         {
-            DataGridViewColumn titleColumn = new LogTextColumn();
-            titleColumn.HeaderText = colName;
-            titleColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
-            titleColumn.Resizable = DataGridViewTriState.NotSet;
-            titleColumn.DividerWidth = 1;
-            titleColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
+            DataGridViewColumn titleColumn = new LogTextColumn
+            {
+                HeaderText = colName,
+                AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
+                Resizable = DataGridViewTriState.NotSet,
+                DividerWidth = 1,
+                SortMode = DataGridViewColumnSortMode.NotSortable
+            };
 
             return titleColumn;
         }
 
-        public static void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gridView)
+        public static void SetColumnizer(ILogLineColumnizer columnizer, BufferedDataGridView gridView)
         {
             int rowCount = gridView.RowCount;
             int currLine = gridView.CurrentCellAddress.Y;
@@ -199,7 +213,7 @@ public static void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gri
             //AutoResizeColumns(gridView);
         }
 
-        public static void AutoResizeColumns(DataGridView gridView)
+        public static void AutoResizeColumns(BufferedDataGridView gridView)
         {
             try
             {
@@ -223,7 +237,7 @@ public static void AutoResizeColumns(DataGridView gridView)
             }
         }
 
-        public static void ApplyDataGridViewPrefs(DataGridView dataGridView, Preferences prefs)
+        public static void ApplyDataGridViewPrefs(BufferedDataGridView dataGridView, Preferences prefs)
         {
             if (dataGridView.Columns.Count > 1)
             {
@@ -250,30 +264,43 @@ public static void ApplyDataGridViewPrefs(DataGridView dataGridView, Preferences
 
         public static Rectangle BorderWidths(DataGridViewAdvancedBorderStyle advancedBorderStyle)
         {
-            Rectangle rect = new();
+            Rectangle rect = new()
+            {
+                X = advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.None
+                ? 0
+                : 1
+            };
 
-            rect.X = advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
             if (advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
                 advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.InsetDouble)
             {
                 rect.X++;
             }
 
-            rect.Y = advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
+            rect.Y = advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.None
+                ? 0
+                : 1;
+
             if (advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
                 advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.InsetDouble)
             {
                 rect.Y++;
             }
 
-            rect.Width = advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
+            rect.Width = advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.None
+                ? 0
+                : 1;
+
             if (advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
                 advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.InsetDouble)
             {
                 rect.Width++;
             }
 
-            rect.Height = advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
+            rect.Height = advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.None
+                ? 0
+                : 1;
+
             if (advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
                 advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.InsetDouble)
             {
@@ -290,12 +317,12 @@ public static Rectangle BorderWidths(DataGridViewAdvancedBorderStyle advancedBor
 
         #region Private Methods
 
-        private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
+        private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
         {
             PaintHighlightedCell(logPaintCtx, e, gridView, noBackgroundFill, groundEntry);
         }
 
-        private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
+        private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
         {
             object value = e.Value ?? string.Empty;
 
@@ -310,9 +337,11 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
             {
                 if (string.IsNullOrEmpty(column.FullValue) == false)
                 {
-                    HilightMatchEntry hme = new();
-                    hme.StartPos = 0;
-                    hme.Length = column.FullValue.Length;
+                    HilightMatchEntry hme = new()
+                    {
+                        StartPos = 0,
+                        Length = column.FullValue.Length
+                    };
 
                     var he = new HilightEntry
                     {
@@ -335,20 +364,23 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
             }
 
             int leftPad = e.CellStyle.Padding.Left;
+
             RectangleF rect = new(e.CellBounds.Left + leftPad, e.CellBounds.Top, e.CellBounds.Width, e.CellBounds.Height);
+
             Rectangle borderWidths = BorderWidths(e.AdvancedBorderStyle);
             Rectangle valBounds = e.CellBounds;
+
             valBounds.Offset(borderWidths.X, borderWidths.Y);
             valBounds.Width -= borderWidths.Right;
             valBounds.Height -= borderWidths.Bottom;
+
             if (e.CellStyle.Padding != Padding.Empty)
             {
                 valBounds.Offset(e.CellStyle.Padding.Left, e.CellStyle.Padding.Top);
                 valBounds.Width -= e.CellStyle.Padding.Horizontal;
                 valBounds.Height -= e.CellStyle.Padding.Vertical;
             }
 
-
             TextFormatFlags flags =
                     TextFormatFlags.Left
                     | TextFormatFlags.SingleLine
@@ -462,19 +494,23 @@ private static IList<HilightMatchEntry> MergeHighlightMatchEntries(IList<Hilight
                 {
                     if (entryArray[pos] != currentEntry)
                     {
-                        HilightMatchEntry me = new();
-                        me.StartPos = lastStartPos;
-                        me.Length = pos - lastStartPos;
-                        me.HilightEntry = currentEntry;
+                        HilightMatchEntry me = new()
+                        {
+                            StartPos = lastStartPos,
+                            Length = pos - lastStartPos,
+                            HilightEntry = currentEntry
+                        };
                         mergedList.Add(me);
                         currentEntry = entryArray[pos];
                         lastStartPos = pos;
                     }
                 }
-                HilightMatchEntry me2 = new();
-                me2.StartPos = lastStartPos;
-                me2.Length = pos - lastStartPos;
-                me2.HilightEntry = currentEntry;
+                HilightMatchEntry me2 = new()
+                {
+                    StartPos = lastStartPos,
+                    Length = pos - lastStartPos,
+                    HilightEntry = currentEntry
+                };
                 mergedList.Add(me2);
             }
             return mergedList;

src/LogExpert/Controls/LogWindow/LogWindow.cs

@@ -160,7 +160,7 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
             ForcePersistenceLoading = forcePersistenceLoading;
 
             dataGridView.CellValueNeeded += OnDataGridViewCellValueNeeded;
-            dataGridView.CellPainting += OnDataGridView_CellPainting;
+            dataGridView.CellPainting += OnDataGridViewCellPainting;
 
             filterGridView.CellValueNeeded += OnFilterGridViewCellValueNeeded;
             filterGridView.CellPainting += OnFilterGridViewCellPainting;
@@ -561,10 +561,13 @@ internal void RefreshAllGrids()
 
         internal void ChangeMultifileMask()
         {
-            MultiFileMaskDialog dlg = new(this, FileName);
-            dlg.Owner = this;
-            dlg.MaxDays = _multiFileOptions.MaxDayTry;
-            dlg.FileNamePattern = _multiFileOptions.FormatPattern;
+            MultiFileMaskDialog dlg = new(this, FileName)
+            {
+                Owner = this,
+                MaxDays = _multiFileOptions.MaxDayTry,
+                FileNamePattern = _multiFileOptions.FormatPattern
+            };
+
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 _multiFileOptions.FormatPattern = dlg.FileNamePattern;
@@ -647,7 +650,7 @@ private void OnButtonSizeChanged(object sender, EventArgs e)
 
         private delegate void PositionAfterReloadFx(ReloadMemento reloadMemento);
 
-        private delegate void AutoResizeColumnsFx(DataGridView gridView);
+        private delegate void AutoResizeColumnsFx(BufferedDataGridView gridView);
 
         private delegate bool BoolReturnDelegate();