Close #65

Author: BornToBeRoot

Source/NETworkManager/Controls/DragablzRemoteDesktopTabItem.cs

@@ -1,8 +1,8 @@
-using System;
+using NETworkManager.ViewModels;
 
 namespace NETworkManager.Controls
 {
-    public class DragablzRemoteDesktopTabItem : IDisposable
+    public class DragablzRemoteDesktopTabItem : ViewModelBase
     {
         public string Header { get; set; }
         public RemoteDesktopControl Control { get; set; }
@@ -12,24 +12,5 @@ public DragablzRemoteDesktopTabItem(string header, RemoteDesktopControl control)
             Header = header;
             Control = control;
         }
-
-        private bool _disposed;
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-                return;
-
-            if (disposing)
-                Control.OnClose();
-
-            _disposed = true;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
     }
 }

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml

@@ -10,15 +10,22 @@
     <Controls:MetroWindow.WindowButtonCommands>
         <Controls:WindowButtonCommands Template="{DynamicResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
     </Controls:MetroWindow.WindowButtonCommands>
-    <Grid Margin="10">
+    <Grid>
         <dragablz:TabablzControl Name="TabsContainer">
             <dragablz:TabablzControl.InterTabController>
                 <dragablz:InterTabController></dragablz:InterTabController>
             </dragablz:TabablzControl.InterTabController>
             <dragablz:TabablzControl.Style>
-                <Style TargetType="{x:Type dragablz:TabablzControl}" BasedOn="{StaticResource DefaultTabablzControl}">
+                <Style TargetType="{x:Type dragablz:TabablzControl}" BasedOn="{StaticResource DefaultTabablzControl}">                
                     <!-- If not null, the header suffix will be removed in the main window -->
                     <Setter Property="HeaderSuffixContent" Value="{x:Null}" />
+                    <Setter Property="ContentTemplate">
+                        <Setter.Value>
+                            <DataTemplate>
+                                <ContentPresenter Content="{Binding Control}" />
+                            </DataTemplate>
+                        </Setter.Value>
+                    </Setter>
                 </Style>
             </dragablz:TabablzControl.Style>
         </dragablz:TabablzControl>

Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs

@@ -7,10 +7,11 @@
 using System.Windows.Input;
 using System;
 using System.Windows.Threading;
+using System.Diagnostics;
 
 namespace NETworkManager.Controls
 {
-       
+
     public partial class RemoteDesktopControl : UserControl, INotifyPropertyChanged
     {
         #region PropertyChangedEventHandler
@@ -23,6 +24,8 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         #endregion
 
         #region Variables
+        private bool _initialized = false;
+
         private const string RemoteDesktopDisconnectReasonIdentifier = "String_RemoteDesktopDisconnectReason_";
 
         private RemoteDesktopSessionInfo _rdpSessionInfo;
@@ -112,13 +115,24 @@ public RemoteDesktopControl(RemoteDesktopSessionInfo info)
 
             reconnectAdjustScreenTimer.Tick += ReconnectAdjustScreenTimer_Tick;
             reconnectAdjustScreenTimer.Interval = new TimeSpan(0, 0, 0, 0, 500);
+
+            Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            if (!Connected)
+            // Connect after the control is drawn and only on the first init
+            if (!_initialized)
+            {
                 Connect();
-        }     
+                _initialized = true;
+            }
+        }
+
+        private void Dispatcher_ShutdownStarted(object sender, EventArgs e)
+        {
+            OnClose();
+        }
         #endregion
 
         #region ICommands & Actions
@@ -348,7 +362,7 @@ private void ReconnectAdjustScreenTimer_Tick(object sender, EventArgs e)
 
             // Reconnect with new resulution
             ReconnectAdjustScreen();
-        }               
+        }
         #endregion
     }
 }

Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs

@@ -106,8 +106,6 @@ public RemoteDesktopViewModel(IDialogCoordinator instance)
             InterTabClient = new DragablzMainInterTabClient();
             TabItems = new ObservableCollection<DragablzRemoteDesktopTabItem>();
 
-            TabItems.CollectionChanged += TabItems_CollectionChanged;
-
             // Load sessions
             if (RemoteDesktopSessionManager.Sessions == null)
                 RemoteDesktopSessionManager.Load();
@@ -397,16 +395,5 @@ private async void DeleteSessionAction()
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
-
-        #region Events
-        private void TabItems_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (e.Action == NotifyCollectionChangedAction.Remove)
-            {
-                DragablzRemoteDesktopTabItem item = (DragablzRemoteDesktopTabItem)e.OldItems[0];
-                item.Dispose();
-            }
-        }
-        #endregion
     }
 }