fix: fixed list actions.

ArchiDog1998 · Aug 14, 2023 · cd79779 · cd79779
1 parent 9e09de7
commit cd79779
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 29 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -0,0 +1 @@
+null
diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -185,7 +185,7 @@ public virtual unsafe uint MPNeed
     /// <summary>
     /// Animation Lock Time.
     /// </summary>
-    public float AnimationLockTime => OtherConfiguration.AnimationLockTime.TryGetValue(AdjustedID, out var time) ? time : 0.6f;
+    public float AnimationLockTime => OtherConfiguration.AnimationLockTime?.TryGetValue(AdjustedID, out var time) ?? false ? time : 0.6f;
 
     /// <summary>
     /// General Constructer.

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1503,7 +1503,38 @@ private static void DrawActionsList(string name, HashSet<uint> actions)
     {
         uint removeId = 0;
 
-        var popupId = "Rotation Solver Popup" + name;
+        var popupId = "Rotation Solver Action Popup" + name;
+
+        if (ImGui.BeginPopup(popupId))
+        {
+            ImGui.SetNextItemWidth(200 * _scale);
+            ImGui.InputTextWithHint("##Searching the action pop up", LocalizationManager.RightLang.ConfigWindow_List_ActionNameOrId, ref _actionSearching, 128);
+
+            ImGui.Spacing();
+
+            if (ImGui.BeginChild("Rotation Solver Add action", new Vector2(-1, 400 * _scale)))
+            {
+                foreach (var action in AllActions.OrderBy(s => Math.Min(StringComparer.Distance(s.Name, _actionSearching)
+                , StringComparer.Distance(s.RowId.ToString(), _actionSearching))))
+                {
+                    ImGui.Selectable($"{action.Name} ({action.RowId})");
+                    if (ImGui.IsItemHovered())
+                    {
+                        ImguiTooltips.ShowTooltip($"{action.Name} ({action.RowId})");
+                        if(ImGui.IsMouseClicked(ImGuiMouseButton.Left))
+                        {
+                            actions.Add(action.RowId);
+                            OtherConfiguration.Save();
+                            ImGui.CloseCurrentPopup();
+                        }
+                    }
+                }
+                ImGui.EndChild();
+            }
+
+            ImGui.EndPopup();
+        }
+
 
         if (ImGui.Button(LocalizationManager.RightLang.ConfigWindow_List_AddAction + "##" + name))
         {
@@ -1529,33 +1560,6 @@ private static void DrawActionsList(string name, HashSet<uint> actions)
             Searchable.ExecuteHotKeysPopup(key, string.Empty, string.Empty, false, (Reset, new Dalamud.Game.ClientState.Keys.VirtualKey[] { Dalamud.Game.ClientState.Keys.VirtualKey.DELETE }));
         }
 
-
-        if (ImGui.BeginPopup(popupId))
-        {
-            ImGui.SetNextItemWidth(200 * _scale);
-            ImGui.InputTextWithHint("##Searching the action pop up", LocalizationManager.RightLang.ConfigWindow_List_ActionNameOrId, ref _actionSearching, 128);
-
-            ImGui.Spacing();
-
-            if (ImGui.BeginChild("Rotation Solver Add action", new Vector2(-1, 400 * _scale)))
-            {
-                foreach (var action in AllActions.OrderBy(s => Math.Min(StringComparer.Distance(s.Name, _actionSearching)
-                , StringComparer.Distance(s.RowId.ToString(), _actionSearching))))
-                {
-                    ImGui.Selectable($"{action.Name} ({action.RowId})");
-                    {
-                        actions.Add(action.RowId);
-                        OtherConfiguration.Save();
-                        ImGui.CloseCurrentPopup();
-                    }
-                    ImguiTooltips.HoveredTooltip($"{action.Name} ({action.RowId})");
-                }
-                ImGui.EndChild();
-            }
-
-            ImGui.EndPopup();
-        }
-
         if (removeId != 0)
         {
             actions.Remove(removeId);