MERGE

1 files changed, 18 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
index 6ebfd9832..ab181e8dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
@@ -12,17 +12,33 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.SharedUI;
 
 namespace Tango.MachineStudio.Developer.Views
 {
     /// <summary>
-    /// Interaction logic for MainView.xaml
+    /// Interaction logic for DeveloperView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView : UserControl, IMainView
     {
+        private bool _loaded;
+        public static MainView Instance { get; set; }
+
         public MainView()
         {
             InitializeComponent();
+            Instance = this;
+
+            Loaded += (x, y) => 
+            {
+                if (!_loaded)
+                {
+                    _loaded = true;
+                    ViewAttached?.Invoke(this, this);
+                }
+            };
         }
+
+        public event EventHandler<IView> ViewAttached;
     }
 }