Handle files changing on disk whilst editor is focused.

When editor is not in focus, queue definition changes. Only reload on focused again.

Author: Lyeeedar

StructuredXmlEditor/Data/Document.cs

@@ -101,6 +101,23 @@ public Document(string path, Workspace workspace)
 			backupTimer.Start();
 		}
 
+		//-----------------------------------------------------------------------
+		public void PromptForReload()
+		{
+			if (NeedsReload)
+			{
+				NeedsReload = false;
+
+				string response = Message.Show("This document changed on disk, do you want to reload it? Clicking Yes will discard any local changes.", "Document Changed On Disk", "Yes", "No");
+
+				if (response == "Yes")
+				{
+					Close(true);
+					Workspace.Open(Path);
+				}
+			}
+		}
+
 		//-----------------------------------------------------------------------
 		private void OpenInExplorer(string path)
 		{

StructuredXmlEditor/Data/Workspace.cs

@@ -29,6 +29,31 @@ public class Workspace : NotifyPropertyChanged
 		//-----------------------------------------------------------------------
 		public static Workspace Instance;
 
+		//-----------------------------------------------------------------------
+		public bool IsWorkspaceActive
+		{
+			get { return m_isWorkspaceActive; }
+			set
+			{
+				m_isWorkspaceActive = value;
+
+				if (value)
+				{
+					Current?.PromptForReload();
+
+					if (NeedsLoadDefinitions)
+					{
+						NeedsLoadDefinitions = false;
+						LoadDefinitions();
+					}
+				}
+			}
+		}
+		private bool m_isWorkspaceActive;
+
+		//--------------------------------------------------------------------------
+		private bool NeedsLoadDefinitions { get; set; }
+
 		//-----------------------------------------------------------------------
 		public ObservableCollection<Document> Documents { get; set; } = new ObservableCollection<Document>();
 		public Document Current
@@ -40,15 +65,7 @@ public Document Current
 
 				if (m_current != null && m_current.NeedsReload)
 				{
-					m_current.NeedsReload = false;
-
-					string response = Message.Show("This document changed on disk, do you want to reload it? Clicking Yes will discard any local changes.", "Document Changed On Disk", "Yes", "No");
-
-					if (response == "Yes")
-					{
-						m_current.Close(true);
-						Current = Open(m_current.Path);
-					}
+					m_current.PromptForReload();
 				}
 
 				RaisePropertyChangedEvent();
@@ -274,31 +291,51 @@ public void SetupFileChangeHandlers()
 		{
 			FileChanged += (path) =>
 			{
-				if (Path.GetExtension(path) == ".xmldef") LoadDefinitions();
+				if (Path.GetExtension(path) == ".xmldef")
+				{
+					QueueLoadDefinitions();
+				}
 
 				var open = Documents.FirstOrDefault(e => e.Path == path);
 				if (open != null)
 				{
 					open.NeedsReload = true;
+					if (IsWorkspaceActive)
+					{
+						open.PromptForReload();
+					}
 				}
 
 				ProjectViewTool.Instance.Add(path);
 			};
 
 			FileCreated += (path) =>
 			{
-				if (Path.GetExtension(path) == ".xmldef") LoadDefinitions();
+				if (Path.GetExtension(path) == ".xmldef")
+				{
+					QueueLoadDefinitions();
+				}
+
 				ProjectViewTool.Instance.Add(path);
 			};
 
 			FileDeleted += (path) =>
 			{
-				if (Path.GetExtension(path) == ".xmldef") LoadDefinitions();
+				if (Path.GetExtension(path) == ".xmldef")
+				{
+					QueueLoadDefinitions();
+				}
+
 				ProjectViewTool.Instance.Remove(path);
 			};
 
 			FileRenamed += (oldPath, newPath) =>
 			{
+				if (Path.GetExtension(oldPath) == ".xmldef" || Path.GetExtension(newPath) == ".xmldef")
+				{
+					QueueLoadDefinitions();
+				}
+
 				ProjectViewTool.Instance.Remove(oldPath);
 				ProjectViewTool.Instance.Add(newPath);
 			};
@@ -435,6 +472,19 @@ public string LoadProjectRoot(bool isFailure = true)
 			return null;
 		}
 
+		//-----------------------------------------------------------------------
+		public void QueueLoadDefinitions()
+		{
+			if (IsWorkspaceActive)
+			{
+				LoadDefinitions();
+			}
+			else
+			{
+				NeedsLoadDefinitions = true;
+			}
+		}
+
 		//-----------------------------------------------------------------------
 		public void LoadDefinitions()
 		{

StructuredXmlEditor/MainWindow.xaml.cs

@@ -60,7 +60,15 @@ public MainWindow()
 			{
 				if (Workspace != null)
 				{
-					Workspace.Current = Workspace.Current;
+					Workspace.IsWorkspaceActive = true;
+				}
+			};
+
+			Deactivated += (e, args) =>
+			{
+				if (Workspace != null)
+				{
+					Workspace.IsWorkspaceActive = false;
 				}
 			};
 		}