Fix LT-22539: Loss of focus from gloss field

Author: jtmaxwell3

Src/Common/FwUtils/EventConstants.cs

@@ -33,6 +33,7 @@ public static class EventConstants
 		public const string RefreshCurrentList = "RefreshCurrentList";
 		public const string RefreshInterlin = "RefreshInterlin";
 		public const string RefreshPopupWindowFonts = "RefreshPopupWindowFonts";
+		public const string RefreshSandbox = "RefreshSandbox";
 		public const string ReloadAreaTools = "ReloadAreaTools";
 		public const string RemoveFilters = "RemoveFilters";
 		public const string RestoreScrollPosition = "RestoreScrollPosition";

Src/LexText/Interlinear/InterlinDocForAnalysis.Designer.cs

@@ -47,6 +47,16 @@ public InterlinDocForAnalysis()
 			InitializeComponent();
 			RightMouseClickedEvent += InterlinDocForAnalysis_RightMouseClickedEvent;
 			DoSpellCheck = true;
+			FwUtils.Subscriber.Subscribe(EventConstants.RefreshSandbox, RefreshSandbox);
+		}
+
+		private void RefreshSandbox(object commandObject)
+		{
+			if (IsFocusBoxInstalled && FocusBox.SelectedOccurrence != null)
+			{
+				FocusBox.SelectOccurrence(FocusBox.SelectedOccurrence);
+				MoveFocusBoxIntoPlace();
+			}
 		}
 
 		void InterlinDocForAnalysis_RightMouseClickedEvent(SimpleRootSite sender, FwRightMouseClickEventArgs e)
@@ -113,13 +123,6 @@ public override void PropChanged(int hvo, int tag, int ivMin, int cvIns, int cvD
 					MoveFocusBoxIntoPlace();
 				}
 			}
-			if (IsFocusBoxInstalled && FocusBox.SelectedOccurrence != null
-				&& tag == LexSenseTags.kflidGloss && FocusBox.ContainsLexEntry(hvo))
-			{
-				// Somebody changed something in the sandbox.  Reset the focus box to reflect the change.
-				FocusBox.SelectOccurrence(FocusBox.SelectedOccurrence);
-				MoveFocusBoxIntoPlace();
-			}
 		}
 
 		protected override void UpdateWordforms(HashSet<IWfiWordform> wordforms)

Src/LexText/Interlinear/InterlinDocForAnalysis.cs

@@ -1,3 +1,4 @@
+using SIL.FieldWorks.Common.FwUtils;
 using SIL.FieldWorks.Common.RootSites;
 using SIL.LCModel;
 using SIL.Utils;
@@ -58,6 +59,7 @@ private void PopupToolWindow_Deactivate(object sender, EventArgs e)
 			{
 				oldActiveClerk.ActivateUI(oldUseRecordTreeBar, oldOldUpdateStatusBar);
 			}
+			FwUtils.Publisher.Publish(new PublisherParameterObject("RefreshSandbox"));
 		}
 
 		private void PopupToolWindow_Activated(object sender, EventArgs e)