Code cleanup - CancelEventArgs

Author: tig

Terminal.Gui/View/CancelEventArgs.cs

@@ -27,7 +27,16 @@ public CancelEventArgs (ref readonly T currentValue, ref T newValue, bool cancel
         NewValue = newValue;
     }
 
-    protected CancelEventArgs () { }
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="CancelEventArgs{T}"/> class.
+    /// </summary>
+    /// <param name="currentValue">The current (old) value of the property.</param>
+    /// <param name="newValue">The value the property will be set to if the event is not cancelled.</param>
+    protected CancelEventArgs (T currentValue, T newValue)
+    {
+        CurrentValue = currentValue;
+        NewValue = newValue;
+    }
 
     /// <summary>The current value of the property.</summary>
     public T CurrentValue { get; }

Terminal.Gui/Views/HexView.cs

@@ -431,10 +431,10 @@ public override void OnDrawContent (Rectangle viewport)
         Driver.SetAttribute (current);
         Move (0, 0);
 
-        int nblocks = BytesPerLine / NUM_BYTES_PER_HEX_COLUMN;
-        var data = new byte [nblocks * NUM_BYTES_PER_HEX_COLUMN * viewport.Height];
+        int nBlocks = BytesPerLine / NUM_BYTES_PER_HEX_COLUMN;
+        var data = new byte [nBlocks * NUM_BYTES_PER_HEX_COLUMN * viewport.Height];
         Source.Position = _displayStart;
-        int n = _source.Read (data, 0, data.Length);
+        int n = _source!.Read (data, 0, data.Length);
 
         Attribute activeColor = GetHotNormalColor ();
         Attribute trackingColor = GetHotFocusColor ();
@@ -451,7 +451,7 @@ public override void OnDrawContent (Rectangle viewport)
             Move (0, line);
             currentAttribute = GetHotNormalColor ();
             Driver.SetAttribute (currentAttribute);
-            var address = $"{_displayStart + line * nblocks * NUM_BYTES_PER_HEX_COLUMN:x8}";
+            var address = $"{_displayStart + line * nBlocks * NUM_BYTES_PER_HEX_COLUMN:x8}";
             Driver.AddStr ($"{address.Substring (8 - AddressWidth)}");
 
             if (AddressWidth > 0)
@@ -461,11 +461,11 @@ public override void OnDrawContent (Rectangle viewport)
 
             SetAttribute (GetNormalColor ());
 
-            for (var block = 0; block < nblocks; block++)
+            for (var block = 0; block < nBlocks; block++)
             {
                 for (var b = 0; b < NUM_BYTES_PER_HEX_COLUMN; b++)
                 {
-                    int offset = line * nblocks * NUM_BYTES_PER_HEX_COLUMN + block * NUM_BYTES_PER_HEX_COLUMN + b;
+                    int offset = line * nBlocks * NUM_BYTES_PER_HEX_COLUMN + block * NUM_BYTES_PER_HEX_COLUMN + b;
                     byte value = GetData (data, offset, out bool edited);
 
                     if (offset + _displayStart == Address || edited)
@@ -482,12 +482,12 @@ public override void OnDrawContent (Rectangle viewport)
                     Driver.AddRune (_spaceCharRune);
                 }
 
-                Driver.AddStr (block + 1 == nblocks ? " " : $"{_columnSeparatorRune} ");
+                Driver.AddStr (block + 1 == nBlocks ? " " : $"{_columnSeparatorRune} ");
             }
 
-            for (var bitem = 0; bitem < nblocks * NUM_BYTES_PER_HEX_COLUMN; bitem++)
+            for (var bitem = 0; bitem < nBlocks * NUM_BYTES_PER_HEX_COLUMN; bitem++)
             {
-                int offset = line * nblocks * NUM_BYTES_PER_HEX_COLUMN + bitem;
+                int offset = line * nBlocks * NUM_BYTES_PER_HEX_COLUMN + bitem;
                 byte b = GetData (data, offset, out bool edited);
                 Rune c;