Merge pull request #336 from Khaos66/activeContent

Keep ActiveContent when switching RootPanel
Dirkster99 · Mar 5, 2022 · 141525e · 141525e
2 parents d68b926 + 5a03954
commit 141525e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/source/Components/AvalonDock/Layout/LayoutRoot.cs b/source/Components/AvalonDock/Layout/LayoutRoot.cs
@@ -98,9 +98,19 @@ public LayoutPanel RootPanel
 			{
 				if (_rootPanel == value) return;
 				RaisePropertyChanging(nameof(RootPanel));
+				var activeContent = ActiveContent;
+				var activeRoot = activeContent?.Root;
 				if (_rootPanel != null && _rootPanel.Parent == this) _rootPanel.Parent = null;
 				_rootPanel = value ?? new LayoutPanel(new LayoutDocumentPane());
 				_rootPanel.Parent = this;
+				if (ActiveContent == null && activeRoot == this && activeContent != null)
+				{
+					ActiveContent = activeContent;
+					if (ActiveContent != activeContent)
+					{
+						ActiveContent = activeContent;
+					}
+				}
 				RaisePropertyChanged(nameof(RootPanel));
 			}
 		}