ThicknessEventArgs -> CancelEventArgs<string>

Terminal.Gui/Drawing/ThicknessEventArgs.cs

@@ -1,16 +0,0 @@
-#nullable enable
-
-namespace Terminal.Gui;
-
-/// <summary>Event arguments for the <see cref="Thickness"/> events.</summary>
-public class ThicknessEventArgs : EventArgs
-{
-    /// <summary>Initializes a new instance of <see cref="ThicknessEventArgs"/></summary>
-    public ThicknessEventArgs () { }
-
-    /// <summary>The previous Thickness.</summary>
-    public Thickness PreviousThickness { get; set; } = Thickness.Empty;
-
-    /// <summary>The new Thickness.</summary>
-    public Thickness Thickness { get; set; } = Thickness.Empty;
-}

Terminal.Gui/View/Adornment/Adornment.cs

@@ -45,10 +45,10 @@ public class Adornment : View
         get => _thickness;
         set
         {
-            Thickness prev = _thickness;
+            Thickness current = _thickness;
             _thickness = value;
 
-            if (prev != _thickness)
+            if (current != _thickness)
             {
                 if (Parent?.IsInitialized == false)
                 {
@@ -61,21 +61,18 @@ public class Adornment : View
                     Parent?.LayoutSubviews ();
                 }
 
-                OnThicknessChanged (prev);
+                OnThicknessChanged (new (current, Thickness));
             }
         }
     }
 
     /// <summary>Fired whenever the <see cref="Thickness"/> property changes.</summary>
-    public event EventHandler<ThicknessEventArgs> ThicknessChanged;
+    public event EventHandler<CancelEventArgs<Thickness>> ThicknessChanged;
 
     /// <summary>Called whenever the <see cref="Thickness"/> property changes.</summary>
-    public void OnThicknessChanged (Thickness previousThickness)
+    public void OnThicknessChanged (CancelEventArgs<Thickness> args)
     {
-        ThicknessChanged?.Invoke (
-                                  this,
-                                  new () { Thickness = Thickness, PreviousThickness = previousThickness }
-                                 );
+        ThicknessChanged?.Invoke (this, args);
     }
 
     #endregion Thickness

UnitTests/View/Adornment/AdornmentTests.cs

@@ -326,8 +326,8 @@ public class AdornmentTests (ITestOutputHelper output)
         adornment.ThicknessChanged += (s, e) =>
                                       {
                                           raised = true;
-                                          Assert.Equal (Thickness.Empty, e.PreviousThickness);
-                                          Assert.Equal (new Thickness (1, 2, 3, 4), e.Thickness);
+                                          Assert.Equal (Thickness.Empty, e.CurrentValue);
+                                          Assert.Equal (new Thickness (1, 2, 3, 4), e.NewValue);
                                           Assert.Equal (new Thickness (1, 2, 3, 4), adornment.Thickness);
                                       };
         adornment.Thickness = new Thickness (1, 2, 3, 4);