Stick buttons (#9)

Author: lucasteles

InputDisplay.sln.DotSettings

@@ -10,6 +10,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MP/@EntryIndexedValue">MP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RB/@EntryIndexedValue">RB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RS/@EntryIndexedValue">RS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RT/@EntryIndexedValue">RT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SOCD/@EntryIndexedValue">SOCD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "9.0.204",
         "rollForward": "latestMinor"
     }
 }

src/InputDisplay/.config/dotnet-tools.json

@@ -3,34 +3,34 @@
   "isRoot": true,
   "tools": {
     "dotnet-mgcb": {
-      "version": "3.8.1.303",
+      "version": "3.8.4",
       "commands": [
         "mgcb"
       ]
     },
     "dotnet-mgcb-editor": {
-      "version": "3.8.1.303",
+      "version": "3.8.4",
       "commands": [
         "mgcb-editor"
       ]
     },
     "dotnet-mgcb-editor-linux": {
-      "version": "3.8.1.303",
+      "version": "3.8.4",
       "commands": [
         "mgcb-editor-linux"
       ]
     },
     "dotnet-mgcb-editor-windows": {
-      "version": "3.8.1.303",
+      "version": "3.8.4",
       "commands": [
         "mgcb-editor-windows"
       ]
     },
     "dotnet-mgcb-editor-mac": {
-      "version": "3.8.1.303",
+      "version": "3.8.4",
       "commands": [
         "mgcb-editor-mac"
       ]
     }
   }
-}
+}

src/InputDisplay/Config/Window/SettingsControls.cs

@@ -22,6 +22,7 @@ public sealed class SettingsControls(Desktop desktop, SettingsManager configMana
     Dictionary<ButtonName, Button> Buttons { get; } = [];
     Dictionary<ButtonName, Button> Macros { get; } = [];
 
+    Theme fallbackTheme;
     WindowDialog currentModal;
     ComboView controllerTypeCombo = new();
     Theme defaultTheme;
@@ -75,6 +76,8 @@ public Widget BuildUI()
         ButtonName.MK,
         ButtonName.HK,
         ButtonName.KK,
+        ButtonName.LS,
+        ButtonName.RS,
     ];
 
     PlayerInputDevice player;
@@ -86,6 +89,7 @@ public void SetPlayer(PlayerInputDevice pad)
         var currentType = Config.InputMap.GetPadKind(pad);
         controllerTypeCombo.SelectedIndex = ThemeConfig.ControllerTypes.Keys.ToArray().IndexOf(currentType);
         player = pad;
+        RefreshFallbackTheme();
 
         foreach (var button in Directions)
             if (!player.IsKeyboard ||
@@ -123,18 +127,27 @@ void RebuildMacroButtons()
             var theme = ThemeManager.Get(Config.CurrentTheme);
             var macros = theme.GetMacro(buttonName, Config.Macros);
             if (macros.Length is 0)
+            {
+                var texture = theme.GetTexture(buttonName)
+                              ?? fallbackTheme?.GetTexture(buttonName)
+                              ?? ThemeManager.UnknownButton;
+
                 content.Widgets.Add(new Image
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Right,
-                    Renderable = new TextureRegion(ThemeManager.UnknownButton),
+                    Renderable = new TextureRegion(texture),
                     Width = 30,
                     Height = 30,
                 });
+            }
             else
                 foreach (var part in macros)
                 {
-                    var texture = theme.GetTexture(part) ?? ThemeManager.UnknownButton;
+                    var texture = theme.GetTexture(part)
+                                  ?? fallbackTheme?.GetTexture(part)
+                                  ?? ThemeManager.UnknownButton;
+
                     content.Widgets.Add(new Image
                     {
                         VerticalAlignment = VerticalAlignment.Center,
@@ -180,7 +193,7 @@ Dialog CreateMacroDialog(ButtonName buttonName)
 
         foreach (var b in allButtonNames)
         {
-            var texture = theme.GetTexture(b);
+            var texture = theme.GetTexture(b) ?? fallbackTheme?.GetTexture(b);
             if (texture is null) continue;
 
             Image icon = new()
@@ -245,6 +258,7 @@ Grid BuildMacroMap()
         root.ColumnsProportions.Add(new(ProportionType.Auto));
         root.ColumnsProportions.Add(new(ProportionType.Auto));
         root.ColumnsProportions.Add(new(ProportionType.Auto));
+        root.ColumnsProportions.Add(new(ProportionType.Auto));
         root.RowsProportions.Add(new(ProportionType.Auto));
         root.RowsProportions.Add(new(ProportionType.Auto));
 
@@ -276,7 +290,7 @@ Grid BuildMacroMap()
             RebuildMacroButtons();
         };
 
-        Grid.SetColumn(resetMapButton, 3);
+        Grid.SetColumn(resetMapButton, 4);
         Grid.SetRow(resetMapButton, 0);
         root.Widgets.Add(resetMapButton);
 
@@ -290,6 +304,8 @@ Grid BuildMacroMap()
         SetMacroButton(ButtonName.MK, (2, 1));
         SetMacroButton(ButtonName.HK, (2, 2));
         SetMacroButton(ButtonName.KK, (2, 3));
+        SetMacroButton(ButtonName.LS, (1, 4));
+        SetMacroButton(ButtonName.RS, (2, 4));
 
         return root;
 
@@ -852,11 +868,13 @@ VerticalStackPanel BuildInputMap()
         InitButton(ButtonName.MP, (1, 2), buttonsGrid);
         InitButton(ButtonName.HP, (1, 3), buttonsGrid);
         InitButton(ButtonName.PP, (1, 4), buttonsGrid);
+        InitButton(ButtonName.LS, (1, 5), buttonsGrid);
 
         InitButton(ButtonName.LK, (2, 1), buttonsGrid);
         InitButton(ButtonName.MK, (2, 2), buttonsGrid);
         InitButton(ButtonName.HK, (2, 3), buttonsGrid);
         InitButton(ButtonName.KK, (2, 4), buttonsGrid);
+        InitButton(ButtonName.RS, (2, 5), buttonsGrid);
 
         return root;
     }
@@ -1028,13 +1046,29 @@ Panel BuildSelectedController()
     void OnChangeControllerType(object sender, EventArgs e)
     {
         if (sender is not ListView { SelectedItem: Label { Tag: PlayerInputDevice.Kind kind } }
-            || player is null || Config.InputMap.GetMapping(player) is not { } mapping)
+            || player is null
+            || Config.InputMap.GetMapping(player) is not { } mapping
+           )
             return;
 
         mapping.Kind = kind;
+        RefreshFallbackTheme();
         SaveConfig();
     }
 
+    void RefreshFallbackTheme()
+    {
+        if (player is null) return;
+
+        var kind = Config.InputMap.GetPadKind(player);
+        var theme = ThemeManager.GetFallback(kind);
+
+        if (fallbackTheme == theme) return;
+
+        fallbackTheme = theme;
+        RebuildMacroButtons();
+    }
+
     public void HighLightDirection(Direction dir)
     {
         var index = NumpadNotation.From(dir) - 1;