more merge fixes

Terminal.Gui/Application.cs

@@ -1590,22 +1590,17 @@ public static partial class Application
 
         //Debug.WriteLine ($"OnMouseEvent: ({a.MouseEvent.X},{a.MouseEvent.Y}) - {a.MouseEvent.Flags}");
 
-        if (view.OnMouseEvent (me))
-        {
-            // Should we bubble up the event, if it is not handled?
-            //return;
-        }
-        //while (view is {} && !view.OnMouseEvent (me))
-        //{
-        //    if (view is Adornment ad)
-        //    {
-        //        view = ad.Parent.SuperView;
-        //    }
-        //    else
-        //    {
-        //        view = view.SuperView;
-        //    }
-        //}
+        while (view is {} && !view.OnMouseEvent (me))
+        {
+            if (view is Adornment ad)
+            {
+                view = ad.Parent.SuperView;
+            }
+            else
+            {
+                view = view.SuperView;
+            }
+        }
 
         BringOverlappedTopToFront ();
     }

UICatalog/Scenarios/Buttons.cs

@@ -339,6 +339,7 @@ public class Buttons : Scenario
             Y = Pos.Bottom (moveUnicodeHotKeyBtn) + 1,
             Title = "_Numeric Up/Down (press-and-hold):",
         };
+
         var downButton = new Button ()
         {
             CanFocus = false,