Fix LT-22539: Loss of focus from gloss field (#931)

* Use EstablishDefaultSense to update the secondary cache
* This also fixes LT-22541
* Allow for the case where a sense appears in more than one morpheme

Author: jtmaxwell3

Src/LexText/Interlinear/FocusBoxController.cs

@@ -47,6 +47,8 @@ internal bool IsDirty
 			get { return m_sandbox.IsDirty; }
 		}
 
+		private bool m_suppressFocusChange = false;
+
 		// There is no logical reason for other buttons ever to get the focus. But .NET helpfully focuses the link words button
 		// as we hide the focus box. And in some other circumstance, which I can't even figure out, it focuses the menu button.
 		// I can't figure out how to prevent it, but it's better for the confirm
@@ -263,7 +265,10 @@ internal void AdjustSizeAndLocationForControls(bool fAdjustOverallSize)
 			}
 			finally
 			{
-				Focus();
+				if (!m_suppressFocusChange)
+				{
+					Focus();
+				}
 				m_fAdjustingSize = false;
 			}
 		}
@@ -310,6 +315,25 @@ public virtual void SelectOccurrence(AnalysisOccurrence selected)
 			ChangeOrCreateSandbox(selected);
 		}
 
+		public void UpdateField(int hvo, int flid)
+		{
+			if (IsDisposed || m_sandbox == null)
+			{
+				return;
+			}
+
+			try
+			{
+				// This fixes LT-22539.
+				m_suppressFocusChange = true;
+				m_sandbox.UpdateField(hvo, flid);
+			}
+			finally
+			{
+				m_suppressFocusChange = false;
+			}
+		}
+
 		#endregion
 
 		internal bool MakeDefaultSelection(object parameter)
@@ -552,6 +576,7 @@ internal interface IAnalysisControlInternal
 		int GetLineOfCurrentSelection();
 		bool SelectOnOrBeyondLine(int startLine, int increment);
 		void UpdateLineChoices(InterlinLineChoices choices);
+		void UpdateField(int hvo, int flid);
 		int MultipleAnalysisColor { set; }
 		bool IsDirty { get; }
 	}

Src/LexText/Interlinear/ITextDllTests/InterlinDocForAnalysisTests.cs

@@ -558,6 +558,11 @@ public void UpdateLineChoices(InterlinLineChoices choices)
 			throw new NotImplementedException();
 		}
 
+		public void UpdateField(int hvo, int flid)
+		{
+			throw new NotImplementedException();
+		}
+
 		public int MultipleAnalysisColor
 		{
 			set { ; }

Src/LexText/Interlinear/InterlinDocForAnalysis.cs

@@ -113,12 +113,9 @@ 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))
+			if (IsFocusBoxInstalled && FocusBox.SelectedOccurrence != null)
 			{
-				// Somebody changed something in the sandbox.  Reset the focus box to reflect the change.
-				FocusBox.SelectOccurrence(FocusBox.SelectedOccurrence);
-				MoveFocusBoxIntoPlace();
+				FocusBox.UpdateField(hvo, tag);
 			}
 		}
 

Src/LexText/Interlinear/SandboxBase.cs

@@ -3,29 +3,29 @@
 // (http://www.gnu.org/licenses/lgpl-2.1.html)
 
 //#define TraceMouseCalls		// uncomment this line to trace mouse messages
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-using System.Diagnostics;
-using System.Text;
-using SIL.LCModel;
-using SIL.FieldWorks.Common.RootSites;
-using SIL.LCModel.Utils;
+using Icu.Collation;
 using SIL.FieldWorks.Common.FwUtils;
+using SIL.FieldWorks.Common.RootSites;
 using SIL.FieldWorks.Common.ViewsInterfaces;
-using SIL.FieldWorks.FdoUi;
 using SIL.FieldWorks.Common.Widgets;
-using SIL.LCModel.DomainServices;
-using SIL.LCModel.Infrastructure;
+using SIL.FieldWorks.FdoUi;
+using SIL.LCModel;
 using SIL.LCModel.Core.Cellar;
-using SIL.LCModel.Core.Text;
 using SIL.LCModel.Core.KernelInterfaces;
+using SIL.LCModel.Core.Text;
+using SIL.LCModel.DomainServices;
+using SIL.LCModel.Infrastructure;
+using SIL.LCModel.Utils;
 using SIL.PlatformUtilities;
-using XCore;
 using SIL.WritingSystems;
-using Icu.Collation;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using XCore;
 
 namespace SIL.FieldWorks.IText
 {
@@ -1656,6 +1656,43 @@ private int CreateSecondaryAndCopyStrings(int flidChoices, int hvoMain, int flid
 				m_caches.MainCache.MainCacheAccessor, m_caches.DataAccess as IVwCacheDa);
 		}
 
+		public void UpdateField(int hvo, int flid)
+		{
+			CheckDisposed();
+			if (!m_cache.ServiceLocator.IsValidObjectId(hvo))
+			{
+				return;
+			}
+			ICmObject hvoObject = Caches.MainCache.ServiceLocator.GetInstance<ICmObjectRepository>().GetObject(hvo);
+			if (hvoObject is ILexSense lexSense)
+			{
+				// This lex sense changed.  Update morphs that use it.
+				foreach (int hvoMorph in GetHvoMorphsForLexSense(hvo))
+				{
+					// This fixes LT-22534.
+					EstablishDefaultSense(hvoMorph, lexSense.Entry, lexSense, null);
+				}
+			}
+			if (hvoObject != null && hvoObject.Owner is IMoMorphSynAnalysis msa)
+			{
+				if (msa.Owner is ILexEntry entry)
+				{
+					foreach (var sense in entry.AllSenses)
+					{
+						if (sense.MorphoSyntaxAnalysisRA == msa)
+						{
+							// This lex sense changed.  Update morphs that use it.
+							foreach (int hvoMorph in GetHvoMorphsForLexSense(sense.Hvo))
+							{
+								// This fixes LT-22541.
+								EstablishDefaultSense(hvoMorph, entry, sense, null);
+							}
+						}
+					}
+				}
+			}
+		}
+
 		/// <summary>
 		/// Set the (real) LexEntry that is considered current. Broadcast a notification
 		/// to delegates if it changed.
@@ -3956,6 +3993,22 @@ protected List<int> LexSensesForCurrentMorphs()
 			return lexSensesForMorphs;
 		}
 
+		private IList<int> GetHvoMorphsForLexSense(int lexSense)
+		{
+			IList<int> hvoMorphs = new List<int>();
+			int cmorphs = m_caches.DataAccess.get_VecSize(kSbWord, ktagSbWordMorphs);
+			for (int i = 0; i < cmorphs; i++)
+			{
+				int hvoMorph = m_caches.DataAccess.get_VecItem(kSbWord, ktagSbWordMorphs, i);
+				int hvoMorphSense = m_caches.DataAccess.get_ObjectProp(hvoMorph, ktagSbMorphGloss);
+				if (m_caches.RealHvo(hvoMorphSense) == lexSense)
+				{
+					hvoMorphs.Add(hvoMorph);
+				}
+			}
+			return hvoMorphs;
+		}
+
 		/// <summary>
 		/// get the current dummy sandbox morphs
 		/// </summary>