fix close shortcuts not closing DASMelements (fix #111)

Author: maxijabase

UI/Components/DASMElement/DASMElement.xaml.cs

@@ -6,13 +6,14 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using smxdasm;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace SPCode.UI.Components
 {
     public partial class DASMElement : UserControl
     {
         private double LineHeight = 0.0;
-
+        public new LayoutDocument Parent;
         private SmxFile file_;
         private readonly StringBuilder detail_buffer_ = new();
         public string FilePath;
@@ -922,6 +923,7 @@ private void Treeview__SelectedItemChanged(object sender, RoutedPropertyChangedE
 
         public void Close()
         {
+            Program.MainWindow.DockingPane.RemoveChild(Parent);
             Program.MainWindow.DASMReferences.Remove(this);
             Program.RecentFilesStack.Push(FilePath);
             Program.MainWindow.UpdateWindowTitle();

UI/MainWindow/MainWindow.xaml.cs

@@ -449,7 +449,7 @@ private void AddEditorElement(FileInfo fInfo, string editorTitle, bool SelectMe,
         private void AddDASMElement(FileInfo fileInfo)
         {
             var layoutDocument = new LayoutDocument { Title = "DASM: " + fileInfo.Name };
-            var dasmElement = new DASMElement(fileInfo);
+            var dasmElement = new DASMElement(fileInfo) { Parent = layoutDocument };
             DASMReferences.Add(dasmElement);
             layoutDocument.Content = dasmElement;
             DockingPane.Children.Add(layoutDocument);

UI/MainWindow/MainWindowCommands.cs

@@ -338,12 +338,13 @@ private void Command_Close()
             try
             {
                 var ee = GetCurrentEditorElement();
-                if (ee == null || ee.IsTemplateEditor || ee.ClosingPromptOpened)
+                var de = GetCurrentDASMElement();
+                if (ee != null && (ee.IsTemplateEditor || ee.ClosingPromptOpened))
                 {
                     return;
                 }
-
-                ee.Close();
+                ee?.Close();
+                de?.Close();
             }
             catch (Exception ex)
             {
@@ -359,13 +360,15 @@ private async void Command_CloseAll()
             try
             {
                 var editors = GetAllEditorElements();
+                var dasm = GetAllDASMElements();
 
                 if (editors == null || editors.Any(x => x.IsTemplateEditor) || editors.Length == 0 || editors.Any(x => x.ClosingPromptOpened))
                 {
                     return;
                 }
 
                 editors.ToList().ForEach(x => x.Close());
+                dasm?.ToList().ForEach(y => y.Close());
             }
             catch (Exception ex)
             {