diff --git a/FSharpExample/Program.fs b/FSharpExample/Program.fs index 88d801f04..febff32a2 100644 --- a/FSharpExample/Program.fs +++ b/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() diff --git a/Terminal.Gui/Views/TabMouseEventArgs.cs b/Terminal.Gui/Views/TabMouseEventArgs.cs index 22a23ad01..30b64d15a 100644 --- a/Terminal.Gui/Views/TabMouseEventArgs.cs +++ b/Terminal.Gui/Views/TabMouseEventArgs.cs @@ -1,7 +1,10 @@ -namespace Terminal.Gui; +#nullable enable +using System.ComponentModel; + +namespace Terminal.Gui; /// Describes a mouse event over a specific in a . -public class TabMouseEventArgs : EventArgs +public class TabMouseEventArgs : HandledEventArgs { /// Creates a new instance of the class. /// that the mouse was over when the event occurred. @@ -13,7 +16,7 @@ public class TabMouseEventArgs : EventArgs } /// - /// Gets the actual mouse event. Use to cancel this event and perform custom + /// Gets the actual mouse event. Use to cancel this event and perform custom /// behavior (e.g. show a context menu). /// public MouseEventArgs MouseEvent { get; } diff --git a/Terminal.Gui/Views/TileView.cs b/Terminal.Gui/Views/TileView.cs index 94f4c0f85..2a834aa92 100644 --- a/Terminal.Gui/Views/TileView.cs +++ b/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? /// Overridden so no Frames get drawn - /// /// protected override bool OnDrawingBorderAndPadding () { return true; } - /// /// protected override bool OnRenderingLineCanvas () { return false; }