Never resolve merge conflicts at 6 am

shibbo · Dec 5, 2023 · 4734a8d · 4734a8d
1 parent b04922a
commit 4734a8d
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/Fushigi/ui/widgets/LevelViewport.cs b/Fushigi/ui/widgets/LevelViewport.cs
@@ -498,19 +498,6 @@ void InteractionWithFocus(KeyboardModifier modifiers)
 
             if (ImGui.IsItemClicked())
             {
-                bool isModeActor = mHoveredObject != null;
-                bool isModeUnit = HoveredPoint != null;
-
-                if (isModeActor && !isModeUnit)
-                {
-                    mEditorMode = EditorMode.Actors;
-                }
-
-                if (isModeUnit && !isModeActor)
-                {
-                    mEditorMode = EditorMode.Units;
-                }
-
                 /* if the user clicked somewhere and it was not hovered over an element, 
                     * we clear our selected actors array */
                 if (mHoveredObject == null)
@@ -550,9 +537,7 @@ void InteractionWithFocus(KeyboardModifier modifiers)
             }
 
             if (ImGui.IsKeyPressed(ImGuiKey.Delete))
-            {
-                mEditorState = EditorState.DeleteActorLinkCheck;
-            }
+                ObjectDeletionRequested?.Invoke(mEditContext.GetSelectedObjects<CourseActor>().ToList());
 
             if (ImGui.IsKeyPressed(ImGuiKey.Escape))
                 mEditContext.DeselectAll();