fix "can't select after deleting" bug and use IsKeyPressed for all vi…

…ewport Hotkeys
shibbo · Nov 20, 2023 · a1e62fb · a1e62fb
1 parent b503b14
commit a1e62fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Fushigi/ui/widgets/CourseScene.cs b/Fushigi/ui/widgets/CourseScene.cs
@@ -440,10 +440,10 @@ private void LinkDeletionCheck()
             {
                 if (activeViewport.mEditContext.IsAnySelected<CourseActor>())
                 {
-                    Console.WriteLine("Switching state to EditorState.DeletingActor");
                     activeViewport.mEditContext.DeleteSelectedActors();
-                    activeViewport.mEditorState = LevelViewport.EditorState.Selecting;
                 }
+                Console.WriteLine("Switching state to EditorState.Selecting");
+                activeViewport.mEditorState = LevelViewport.EditorState.Selecting;
                 return;
             }
 

diff --git a/Fushigi/ui/widgets/LevelViewport.cs b/Fushigi/ui/widgets/LevelViewport.cs
@@ -443,12 +443,12 @@ public void Draw(Vector2 size, double deltaSeconds, IDictionary<string, bool> la
                     }
                 }
 
-                if (ImGui.IsKeyDown(ImGuiKey.Delete))
+                if (ImGui.IsKeyPressed(ImGuiKey.Delete))
                 {
                     mEditorState = EditorState.DeleteActorLinkCheck;
                 }
 
-                if (ImGui.IsKeyDown(ImGuiKey.Escape))
+                if (ImGui.IsKeyPressed(ImGuiKey.Escape))
                 {
                     mEditContext.DeselectAll();
                     mSelectedPoint = null;
@@ -458,7 +458,7 @@ public void Draw(Vector2 size, double deltaSeconds, IDictionary<string, bool> la
             {
                 ImGui.SetTooltip($"Placing actor {mActorToAdd} -- Hold SHIFT to place multiple, ESCAPE to cancel.");
 
-                if (ImGui.IsKeyDown(ImGuiKey.Escape))
+                if (ImGui.IsKeyPressed(ImGuiKey.Escape))
                 {
                     mEditorState = EditorState.Selecting;
                 }
@@ -511,7 +511,7 @@ Click on any actor to delete it.
                             Hold SHIFT to delete multiple actors, ESCAPE to cancel.
                             """);
 
-                    if (ImGui.IsKeyDown(ImGuiKey.Escape))
+                    if (ImGui.IsKeyPressed(ImGuiKey.Escape))
                     {
                         mEditorState = EditorState.Selecting;
                     }
@@ -538,7 +538,7 @@ Click on any actor to delete it.
                     ImGui.SetWindowFocus();
                 }
 
-                if (ImGui.IsKeyDown(ImGuiKey.Escape))
+                if (ImGui.IsKeyPressed(ImGuiKey.Escape))
                 {
                     mEditorState = EditorState.Selecting;
                 }
@@ -839,7 +839,7 @@ Vector2[] GetPoints()
                     }
 
                     //Delete selected
-                    if (selectedPoint != null && ImGui.IsKeyDown(ImGuiKey.Delete))
+                    if (selectedPoint != null && ImGui.IsKeyPressed(ImGuiKey.Delete))
                     {
                         rail.mPoints.Remove(selectedPoint);
                     }