General UI Work

Zennysoft.Game.Ma/src/options/InputMapper.cs

@@ -12,7 +12,7 @@ using Zennysoft.Game.Implementation;
 namespace Zennysoft.Game.Ma;
 
 [Meta(typeof(IAutoNode))]
-public partial class InputMapper : PanelContainer
+public partial class InputMapper : Control
 {
   public override void _Notification(int what) => this.Notify(what);
 
@@ -147,6 +147,8 @@ public partial class InputMapper : PanelContainer
 
     VisibilityChanged += InputMapper_VisibilityChanged;
 
+    FocusEntered += InputMapper_FocusEntered;
+
     InputHelper.JoypadInputChanged += (string action, InputEvent input) =>
     {
       if (!_remappingController)
@@ -191,6 +193,11 @@ public partial class InputMapper : PanelContainer
         joyPadButton.Disabled = true;
   }
 
+  private void InputMapper_FocusEntered()
+  {
+    MoveForwardKeyboard.GrabFocus();
+  }
+
   private void CancelRemap()
   {
     var allButtons = _actionKeyMap.Concat<InputMapButton>(_actionJoyMap);