Fixes gui-cs#3950. KeyDown and MouseEvent no longer fires for Listbox

Author: BDisp

Terminal.Gui/View/View.Keyboard.cs

@@ -319,28 +319,30 @@ public bool NewKeyDownEvent (Key key)
 
         bool RaiseKeyDown (Key k)
         {
-            // Before (fire the cancellable event)
-            if (OnKeyDown (k) || k.Handled)
+            // First fire event
+            KeyDown?.Invoke (this, k);
+
+            if (k.Handled)
             {
                 return true;
             }
 
-            // fire event
-            KeyDown?.Invoke (this, k);
-
-            return k.Handled;
+            // After (fire the cancellable event)
+            return OnKeyDown (k);
         }
 
         bool RaiseKeyDownNotHandled (Key k)
         {
-            if (OnKeyDownNotHandled (k) || k.Handled)
+            // First fire event
+            KeyDownNotHandled?.Invoke (this, k);
+
+            if (k.Handled)
             {
                 return true;
             }
 
-            KeyDownNotHandled?.Invoke (this, k);
-
-            return false;
+            // After (fire the cancellable event)
+            return OnKeyDownNotHandled (k);
         }
     }
 
@@ -453,16 +455,16 @@ public bool NewKeyUpEvent (Key key)
 
         bool RaiseKeyUp (Key k)
         {
-            // Before (fire the cancellable event)
-            if (OnKeyUp (k) || k.Handled)
+            // First fire event
+            KeyUp?.Invoke (this, k);
+
+            if (k.Handled)
             {
                 return true;
             }
 
-            // fire event
-            KeyUp?.Invoke (this, k);
-
-            return k.Handled;
+            // After (fire the cancellable event)
+            return OnKeyUp (k);
         }
     }
 

Terminal.Gui/View/View.Mouse.cs

@@ -335,14 +335,16 @@ protected virtual void OnMouseLeave () { }
     /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
     public bool RaiseMouseEvent (MouseEventArgs mouseEvent)
     {
-        if (OnMouseEvent (mouseEvent) || mouseEvent.Handled)
+        // First fire event
+        MouseEvent?.Invoke (this, mouseEvent);
+
+        if (mouseEvent.Handled)
         {
             return true;
         }
 
-        MouseEvent?.Invoke (this, mouseEvent);
-
-        return mouseEvent.Handled;
+        // After (fire the cancellable event)
+        return OnMouseEvent (mouseEvent);
     }
 
     /// <summary>Called when a mouse event occurs within the view's <see cref="Viewport"/>.</summary>

UnitTests/View/Keyboard/KeyboardEventTests.cs

@@ -102,7 +102,7 @@ public void NewKeyDownUpEvents_Events_Are_Raised_With_Only_Key_Modifiers (bool s
                             Assert.Equal (alt, e.IsAlt);
                             Assert.Equal (control, e.IsCtrl);
                             Assert.False (keyDown);
-                            Assert.True (view.OnKeyDownCalled);
+                            Assert.False (view.OnKeyDownCalled);
                             keyDown = true;
                         };
         view.KeyDownNotHandled += (s, e) => { keyDownNotHandled = true; };
@@ -114,7 +114,7 @@ public void NewKeyDownUpEvents_Events_Are_Raised_With_Only_Key_Modifiers (bool s
                           Assert.Equal (alt, e.IsAlt);
                           Assert.Equal (control, e.IsCtrl);
                           Assert.False (keyUp);
-                          Assert.True (view.OnKeyUpCalled);
+                          Assert.False (view.OnKeyUpCalled);
                           keyUp = true;
                       };
 
@@ -147,6 +147,7 @@ public void NewKeyDownEvent_Handled_True_Stops_Processing ()
     {
         var keyDown = false;
         var keyDownNotHandled = false;
+        var keyHandled = false;
 
         var view = new OnNewKeyTestView ();
         Assert.True (view.CanFocus);
@@ -156,8 +157,8 @@ public void NewKeyDownEvent_Handled_True_Stops_Processing ()
                         {
                             Assert.Equal (KeyCode.A, e.KeyCode);
                             Assert.False (keyDown);
-                            Assert.True (view.OnKeyDownCalled);
-                            e.Handled = true;
+                            Assert.False (view.OnKeyDownCalled);
+                            e.Handled = keyHandled;
                             keyDown = true;
                         };
 
@@ -167,15 +168,29 @@ public void NewKeyDownEvent_Handled_True_Stops_Processing ()
                                    Assert.Equal (KeyCode.A, e.KeyCode);
                                    Assert.False (keyDownNotHandled);
                                    Assert.False (view.OnProcessKeyDownCalled);
-                                   e.Handled = true;
+                                   e.Handled = keyHandled;
                                    keyDownNotHandled = true;
                                };
 
         view.NewKeyDownEvent (Key.A);
         Assert.True (keyDown);
-        Assert.False (keyDownNotHandled);
+        Assert.True (keyDownNotHandled);
 
         Assert.True (view.OnKeyDownCalled);
+        Assert.True (view.OnProcessKeyDownCalled);
+
+        keyDown = false;
+        keyDownNotHandled = false;
+        keyHandled = true;
+        view.CancelVirtualMethods = true;
+        view.OnKeyDownCalled = false;
+        view.OnProcessKeyDownCalled = false;
+
+        view.NewKeyDownEvent (Key.A);
+        Assert.True (keyDown);
+        Assert.False (keyDownNotHandled);
+
+        Assert.False (view.OnKeyDownCalled);
         Assert.False (view.OnProcessKeyDownCalled);
     }
 
@@ -223,7 +238,7 @@ public void NewKeyDownEvent_ProcessKeyDown_Handled_Stops_Processing ()
                         {
                             Assert.Equal (KeyCode.A, e.KeyCode);
                             Assert.False (keyDown);
-                            Assert.True (view.OnKeyDownCalled);
+                            Assert.False (view.OnKeyDownCalled);
                             e.Handled = false;
                             keyDown = true;
                         };
@@ -232,7 +247,7 @@ public void NewKeyDownEvent_ProcessKeyDown_Handled_Stops_Processing ()
                                {
                                    Assert.Equal (KeyCode.A, e.KeyCode);
                                    Assert.False (keyDownNotHandled);
-                                   Assert.True (view.OnProcessKeyDownCalled);
+                                   Assert.False (view.OnProcessKeyDownCalled);
                                    e.Handled = true;
                                    keyDownNotHandled = true;
                                };
@@ -242,13 +257,14 @@ public void NewKeyDownEvent_ProcessKeyDown_Handled_Stops_Processing ()
         Assert.True (keyDownNotHandled);
 
         Assert.True (view.OnKeyDownCalled);
-        Assert.True (view.OnProcessKeyDownCalled);
+        Assert.False (view.OnProcessKeyDownCalled);
     }
 
     [Fact]
     public void NewKeyUpEvent_KeyUp_Handled_True_Stops_Processing ()
     {
         var keyUp = false;
+        var keyHandled = false;
 
         var view = new OnNewKeyTestView ();
         Assert.True (view.CanFocus);
@@ -259,7 +275,7 @@ public void NewKeyUpEvent_KeyUp_Handled_True_Stops_Processing ()
                           Assert.Equal (KeyCode.A, e.KeyCode);
                           Assert.False (keyUp);
                           Assert.False (view.OnProcessKeyDownCalled);
-                          e.Handled = true;
+                          e.Handled = keyHandled;
                           keyUp = true;
                       };
 
@@ -269,6 +285,18 @@ public void NewKeyUpEvent_KeyUp_Handled_True_Stops_Processing ()
         Assert.True (view.OnKeyUpCalled);
         Assert.False (view.OnKeyDownCalled);
         Assert.False (view.OnProcessKeyDownCalled);
+
+        keyUp = false;
+        keyHandled = true;
+        view.CancelVirtualMethods = true;
+        view.OnKeyUpCalled = false;
+
+        view.NewKeyUpEvent (Key.A);
+        Assert.True (keyUp);
+
+        Assert.False (view.OnKeyUpCalled);
+        Assert.False (view.OnKeyDownCalled);
+        Assert.False (view.OnProcessKeyDownCalled);
     }
 
     [Theory]