fix: MenuItemType.Input

oscar-wos · Jun 26, 2024 · 24b7d62 · 24b7d62
1 parent b51e69b
commit 24b7d62
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -57,7 +57,7 @@ jobs:
             - name: Extract version and create tag
               id: extract_version
               run: |
-                version="1.0.3"
+                version="1.0.4"
                 echo "Version found: $version"
                 git config --global user.email "[email protected]"
                 git config --global user.name "GitHub Actions"

diff --git a/src/Menu.cs b/src/Menu.cs
@@ -13,21 +13,22 @@ public class Menu
     private static readonly SayEvent OnSayTeam = new("say_team", OnSayEvent);
     public static event EventHandler<MenuEvent>? OnDrawMenu;
 
-    private static void OnSayEvent(CCSPlayerController? controller, string message)
+    private static HookResult OnSayEvent(CCSPlayerController? controller, string message)
     {
         if (controller == null || !controller.IsValid || !Menus.TryGetValue(controller, out var value))
-            return;
+            return HookResult.Continue;
 
         var menu = value.Peek();
 
         if (!menu.AcceptInput)
-            return;
+            return HookResult.Continue;
 
         var selectedItem = menu.Items[menu.Option];
         selectedItem.DataString = message;
         menu.AcceptInput = false;
 
         menu.Callback?.Invoke(MenuButtons.Input, menu, selectedItem);
+        return HookResult.Handled;
     }
 
     protected static void RaiseDrawMenu(CCSPlayerController controller, MenuBase menu, MenuItem? selectedItem)
@@ -127,14 +128,17 @@ private static void TimerRepeat()
 
                     case MenuButtons.Back:
                         if (menu.AcceptInput)
+                        {
                             menu.AcceptInput = false;
+                            break;
+                        }
 
                         if (menus.Count > 1)
                         {
                             menu.Callback?.Invoke(buttons, menu, null);
                             menus.Pop();
                         }
-                            
+
                         continue;
 
                     case MenuButtons.Exit:
@@ -156,7 +160,9 @@ private static void TimerRepeat()
     public static void DrawMenu(CCSPlayerController controller, MenuBase menu, MenuItem? selectedItem)
     {
         var html = "";
-        var menus = Menus[controller];
+
+        if (!Menus.TryGetValue(controller, out var menus))
+            return;
 
         if (menus.Count > 1)
         {
@@ -196,7 +202,7 @@ public static void DrawMenu(CCSPlayerController controller, MenuBase menu, MenuI
                     break;
 
                 case MenuItemType.Input:
-                    html += FormatInput(menu, menuItem);
+                    html += FormatInput(menu, menuItem, selectedItem!);
                     break;
 
                 case MenuItemType.Bool:
@@ -297,19 +303,19 @@ private static string FormatSlider(MenuBase menu, MenuItem menuItem)
         return html;
     }
 
-    private static string FormatInput(MenuBase menu, MenuItem menuItem)
+    private static string FormatInput(MenuBase menu, MenuItem menuItem, MenuItem selectedItem)
     {
         var html = "";
 
-        if (menu.AcceptInput)
+        if (menu.AcceptInput && menuItem == selectedItem)
             html += menu.Selector[(int)MenuCursor.Left].ToString();
 
         if (menuItem.DataString.Length == 0)
-            html += menu.Input.ToString();
+            html += menu.Input.Value;
         else
-            html += menuItem.DataString;
+            html += $"{menu.Input.Prefix}{menuItem.DataString}{menu.Input.Suffix}";
 
-        if (menu.AcceptInput)
+        if (menu.AcceptInput && menuItem == selectedItem)
             html += menu.Selector[(int)MenuCursor.Right].ToString();
 
         return html;

diff --git a/src/SayEvent.cs b/src/SayEvent.cs
@@ -4,12 +4,12 @@ namespace Menu;
 
 public class SayEvent
 {
-    public SayEvent(string sayCommand, Action<CCSPlayerController, string> callback)
+    public SayEvent(string sayCommand, Func<CCSPlayerController, string, HookResult> callback)
     {
-        var wrappedHandler = new Action<int, IntPtr>((i, ptr) =>
+        var wrappedHandler = new Func<int, IntPtr, HookResult>((i, ptr) =>
         {
             var caller = (i != -1) ? new CCSPlayerController(NativeAPI.GetEntityFromIndex(i + 1)) : null;
-            callback.Invoke(caller!, NativeAPI.CommandGetArgString(ptr).Trim('"'));
+            return callback.Invoke(caller!, NativeAPI.CommandGetArgString(ptr).Trim('"'));
         });
 
         var functionReference = FunctionReference.Create(wrappedHandler);