Browse Source

Merge branch 'v2_develop' into BDisp-v2_2489_scroll-scrollbar-new

Tig 9 months ago
parent
commit
f206bb06c3

+ 1 - 1
FSharpExample/Program.fs

@@ -19,7 +19,7 @@ type ExampleWindow() as this =
         let btnLogin = new Button(Text = "Login", Y = Pos.Bottom(passwordLabel) +  Pos.op_Implicit(1), X = Pos.Center(), IsDefault = true)
 
         // When login button is clicked display a message popup
-        btnLogin.Accept.Add(fun _ ->
+        btnLogin.Accepting.Add(fun _ ->
             if userNameText.Text = "admin" && passwordText.Text = "password" then
                 MessageBox.Query("Logging In", "Login Successful", "Ok") |> ignore
                 ExampleWindow.UserName <- userNameText.Text.ToString()

+ 6 - 3
Terminal.Gui/Views/TabMouseEventArgs.cs

@@ -1,7 +1,10 @@
-namespace Terminal.Gui;
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
 
 /// <summary>Describes a mouse event over a specific <see cref="Tab"/> in a <see cref="TabView"/>.</summary>
-public class TabMouseEventArgs : EventArgs
+public class TabMouseEventArgs : HandledEventArgs
 {
     /// <summary>Creates a new instance of the <see cref="TabMouseEventArgs"/> class.</summary>
     /// <param name="tab"><see cref="Tab"/> that the mouse was over when the event occurred.</param>
@@ -13,7 +16,7 @@ public class TabMouseEventArgs : EventArgs
     }
 
     /// <summary>
-    ///     Gets the actual mouse event.  Use <see cref="MouseEventArgs.Handled"/> to cancel this event and perform custom
+    ///     Gets the actual mouse event.  Use <see cref="HandledEventArgs.Handled"/> to cancel this event and perform custom
     ///     behavior (e.g. show a context menu).
     /// </summary>
     public MouseEventArgs MouseEvent { get; }

+ 0 - 2
Terminal.Gui/Views/TileView.cs

@@ -174,11 +174,9 @@ public class TileView : View
     // BUG: v2 fix this hack
     // QUESTION: Does this need to be fixed before events are refactored?
     /// <summary>Overridden so no Frames get drawn</summary>
-    /// <param name="clipRegion"></param>
     /// <returns></returns>
     protected override bool OnDrawingBorderAndPadding () { return true; }
 
-    /// <param name="clipRegion"></param>
     /// <inheritdoc/>
     protected override bool OnRenderingLineCanvas () { return false; }