Fixup cut/copy/paste (#123)

haroohie-club · Apr 6, 2023 · 85930b4 · 85930b4
1 parent 6ae4ada
commit 85930b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/SerialLoops/Controls/ScriptCommandListPanel.cs b/src/SerialLoops/Controls/ScriptCommandListPanel.cs
@@ -84,6 +84,7 @@ void InitializeComponent()
                         _commands[entry.Command.Section][i].Index++;
                     }
                 }
+                ((ScriptEditor)_editor).PopulateScriptCommands(true);
                 _editor.UpdateTabTitle(false);
             };
             Viewer.DeleteCommand += (o, e) =>
@@ -112,20 +113,22 @@ void InitializeComponent()
                     entry.Command.Section.Objects.Remove(command);
                     _commands[entry.Command.Section].Remove(entry.Command);
                 }
+                ((ScriptEditor)_editor).PopulateScriptCommands(true);
                 _editor.UpdateTabTitle(false);
             };
             Viewer.AddCommand += (o, e) =>
             {
                 var treeGridView = (ScriptCommandSectionTreeGridView)o;
                 var entry = (ScriptCommandSectionEntry)treeGridView.SelectedItem;
+                ScriptSection section = entry.Command.Section ?? e.Command.Section;
 
                 if (string.IsNullOrEmpty(e.SectionTitle))
                 {
-                    e.Command.Script.ScriptSections[e.Command.Script.ScriptSections.IndexOf(e.Command.Section)].Objects.Insert(e.Command.Index, e.Command.Invocation);
-                    _commands[e.Command.Section].Insert(e.Command.Index, e.Command);
-                    for (int i = e.Command.Section.Objects.IndexOf(e.Command.Invocation) + 1; i < e.Command.Section.Objects.Count; i++)
+                    e.Command.Script.ScriptSections[e.Command.Script.ScriptSections.IndexOf(section)].Objects.Insert(e.Command.Index, e.Command.Invocation);
+                    _commands[section].Insert(e.Command.Index, e.Command);
+                    for (int i = section.Objects.IndexOf(e.Command.Invocation) + 1; i < section.Objects.Count; i++)
                     {
-                        _commands[e.Command.Section][i].Index++;
+                        _commands[section][i].Index++;
                     }
                 }
                 else
@@ -149,6 +152,7 @@ void InitializeComponent()
                     _commands.Add(scriptFile.ScriptSections.Last(), new());
                 }
 
+                ((ScriptEditor)_editor).PopulateScriptCommands(true);
                 _editor.UpdateTabTitle(false);
             };
         }

diff --git a/src/SerialLoops/Editors/ScriptEditor.cs b/src/SerialLoops/Editors/ScriptEditor.cs
@@ -55,8 +55,12 @@ public override Container GetEditorPanel()
             return GetCommandsContainer();
         }
 
-        private void PopulateScriptCommands()
+        public void PopulateScriptCommands(bool refresh = false)
         {
+            if (refresh)
+            {
+                _script.Refresh(_project);
+            }
             _commands = _script.GetScriptCommandTree(_project);
         }
 
@@ -267,9 +271,6 @@ private StackLayout GetEditorButtons(ScriptCommandSectionTreeGridView treeGridVi
                             );
 
                             treeGridView.AddItem(new(new(command), scriptSection, command, false));
-                            // Regenerate the command tree
-                            _script.Refresh(_project);
-                            PopulateScriptCommands();
                         }
                         catch (Exception ex)
                         {
@@ -328,8 +329,7 @@ private StackLayout GetEditorButtons(ScriptCommandSectionTreeGridView treeGridVi
                     dialog.Close();
                     ScriptCommandSectionEntry section = new($"NONE{labelBox.Text}", new List<ScriptCommandSectionEntry>(), _script.Event);
                     treeGridView.AddSection(new(section, null, null, true));
-                    _script.Refresh(_project); // Have to recreate the command graph
-                    PopulateScriptCommands();
+
                     _updateOptionDropDowns();
                 };
 
@@ -348,8 +348,6 @@ private StackLayout GetEditorButtons(ScriptCommandSectionTreeGridView treeGridVi
                 if (treeGridView.SelectedCommandTreeItem is not null)
                 {
                     treeGridView.DeleteItem(treeGridView.SelectedCommandTreeItem);
-                    _script.Refresh(_project); // Have to recreate the command graph
-                    PopulateScriptCommands();
                     _updateOptionDropDowns();
                 }
             };
@@ -2152,8 +2150,7 @@ private void OptionDropDown_SelectedKeyChanged(object sender, EventArgs e)
             _script.Event.ScriptSections[_script.Event.ScriptSections.IndexOf(dropDown.Command.Section)]
                 .Objects[dropDown.Command.Index].Parameters[dropDown.ParameterIndex] = (short)_script.Event.ChoicesSection.Objects.IndexOf(choice);
             UpdateTabTitle(false, dropDown);
-            _script.Refresh(_project);
-            PopulateScriptCommands();
+            PopulateScriptCommands(true);
         }
         private void PaletteEffectDropDown_SelectedKeyChanged(object sender, EventArgs e)
         {
@@ -2209,8 +2206,7 @@ private void ScriptSectionDropDown_SelectedKeyChanged(object sender, EventArgs e
             _script.Event.ScriptSections[_script.Event.ScriptSections.IndexOf(dropDown.Command.Section)]
                 .Objects[dropDown.Command.Index].Parameters[dropDown.CurrentShort] =
                 _script.Event.LabelsSection.Objects.First(l => l.Name.Replace("/", "") == dropDown.SelectedKey).Id;
-            _script.Refresh(_project); // Update command graph
-            PopulateScriptCommands();
+            PopulateScriptCommands(true);
             UpdateTabTitle(false, dropDown);
         }
         private void SfxNumericStepper_ValueChanged(object sender, EventArgs e)