Merge pull request #409 from L45eMy/master

Restore previously activated document after closing active document
Dirkster99 · Dec 25, 2022 · 9b56fe2 · 9b56fe2
2 parents 4f47fe4 + 39b4b4f
commit 9b56fe2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs b/source/Components/AvalonDock/Layout/LayoutAnchorablePane.cs
@@ -235,7 +235,14 @@ private void AutoFixSelectedContent()
 		{
 			if (!_autoFixSelectedContent) return;
 			if (SelectedContentIndex >= ChildrenCount) SelectedContentIndex = Children.Count - 1;
-			if (SelectedContentIndex == -1 && ChildrenCount > 0) SetNextSelectedIndex();
+			if (SelectedContentIndex == -1 && ChildrenCount > 0) SetLastActivatedIndex();
+		}
+
+		/// <summary>Sets the current <see cref="SelectedContentIndex"/> to the last activated child with IsEnabled == true</summary>
+		private void SetLastActivatedIndex()
+		{
+			var lastActivatedDocument = Children.Where(c => c.IsEnabled).OrderByDescending(c => c.LastActivationTimeStamp.GetValueOrDefault()).FirstOrDefault();
+			SelectedContentIndex = Children.IndexOf(lastActivatedDocument);
 		}
 
 		private void OnParentChildrenCollectionChanged(object sender, EventArgs e) => RaisePropertyChanged(nameof(IsDirectlyHostedInFloatingWindow));

diff --git a/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs b/source/Components/AvalonDock/Layout/LayoutDocumentPane.cs
@@ -155,7 +155,7 @@ private void AutoFixSelectedContent()
 		{
 			if (!_autoFixSelectedContent) return;
 			if (SelectedContentIndex >= ChildrenCount) SelectedContentIndex = Children.Count - 1;
-			if (SelectedContentIndex == -1 && ChildrenCount > 0) SetNextSelectedIndex();
+			if (SelectedContentIndex == -1 && ChildrenCount > 0) SetLastActivatedIndex();
 		}
 
 		/// <summary>
@@ -223,6 +223,13 @@ internal void SetNextSelectedIndex()
 			}
 		}
 
+		/// <summary>Sets the current <see cref="SelectedContentIndex"/> to the last activated child with IsEnabled == true</summary>
+		private void SetLastActivatedIndex()
+		{
+			var lastActivatedDocument = Children.Where(c => c.IsEnabled).OrderByDescending(c => c.LastActivationTimeStamp.GetValueOrDefault()).FirstOrDefault();
+			SelectedContentIndex = Children.IndexOf(lastActivatedDocument);
+		}
+
 		/// <summary>Updates the <see cref="IsDirectlyHostedInFloatingWindow"/> property of this object.</summary>
 		internal void UpdateIsDirectlyHostedInFloatingWindow() => RaisePropertyChanged(nameof(IsDirectlyHostedInFloatingWindow));