Merge branch 'InterlinMasterRefactor-2nd-Attempt' of https://github.c…

…om/sillsdev/FieldWorks into InterlinMasterRefactor-2nd-Attempt
sillsdev · May 13, 2024 · b00e77d · b00e77d
2 parents 4c8ce06 + 4e6fa1b
commit b00e77d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/Src/Common/SimpleRootSite/SimpleRootSite.cs b/Src/Common/SimpleRootSite/SimpleRootSite.cs
@@ -1537,15 +1537,10 @@ public virtual Point ScrollPosition
 					newPos.Y = 0;
 				}
 
-				if (Platform.IsMono)
-				{
-					if (AllowPainting == true) // FWNX-235
-						AutoScrollPosition = newPos;
-					else
-						cachedAutoScrollPosition = newPos;
-				}
-				else
+				if (!Platform.IsMono || AllowPainting) // FWNX-235
 					AutoScrollPosition = newPos;
+				else
+					cachedAutoScrollPosition = newPos;
 			}
 		}
 

diff --git a/Src/LexText/Interlinear/RawTextPane.cs b/Src/LexText/Interlinear/RawTextPane.cs
@@ -41,6 +41,13 @@ public class RawTextPane : RootSite, IInterlinearTabControl, IHandleBookmark
 		/// </summary>
 		RecordClerk m_clerk;
 
+		private string m_currentTool = "";
+
+		public string CurrentTool
+		{
+			get { return m_currentTool; }
+		}
+
 		public RawTextPane() : base(null)
 		{
 			BackColor = Color.FromKnownColor(KnownColor.Window);
@@ -158,6 +165,8 @@ public IStText RootObject
 			}
 		}
 
+
+
 		internal int LastFoundAnnotationHvo
 		{
 			get
@@ -652,7 +661,21 @@ protected void MakeTextSelectionAndScrollToView(int ichMin, int ichLim, int ws,
 		public void SelectBookmark(IStTextBookmark bookmark)
 		{
 			CheckDisposed();
-			MakeTextSelectionAndScrollToView(bookmark.BeginCharOffset, bookmark.EndCharOffset, 0, bookmark.IndexOfParagraph);
+			if (CanFocus)
+				MakeTextSelectionAndScrollToView(bookmark.BeginCharOffset, bookmark.EndCharOffset, 0, bookmark.IndexOfParagraph);
+			else
+				VisibleChanged += RawTextPane_VisibleChanged;
+		}
+
+		private void RawTextPane_VisibleChanged(object sender, EventArgs e)
+		{
+			if (CanFocus)
+			{
+				var bookmark = InterlinMaster.m_bookmarks[new Tuple<string, Guid>(CurrentTool, RootObject.Guid)];
+				MakeTextSelectionAndScrollToView(bookmark.BeginCharOffset, bookmark.EndCharOffset, 0, bookmark.IndexOfParagraph);
+
+				VisibleChanged -= RawTextPane_VisibleChanged;
+			} 
 		}
 
 		#endregion
@@ -891,6 +914,7 @@ public override void Init(Mediator mediator, PropertyTable propertyTable, XmlNod
 			m_configurationParameters = configurationParameters;
 			m_clerk = ToolConfiguration.FindClerk(m_propertyTable, m_configurationParameters);
 			m_styleSheet = FontHeightAdjuster.StyleSheetFromPropertyTable(m_propertyTable);
+			m_currentTool = configurationParameters.Attributes["clerk"].Value;
 		}
 	}