Remove ActiveContent if SelectedContentIndex == -1 and ChildrenCount …

…<= 0
Dirkster99 · Oct 7, 2019 · 37109e1 · 37109e1
1 parent f0afbfe
commit 37109e1
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
@@ -152,17 +152,27 @@ protected override void OnChildrenCollectionChanged()
     {
       if( this.SelectedContentIndex >= this.ChildrenCount )
         this.SelectedContentIndex = this.Children.Count - 1;
-      if( this.SelectedContentIndex == -1 && this.ChildrenCount > 0 )
+      if( this.SelectedContentIndex == -1 )
       {
-        if( this.Root == null )
+        if( this.ChildrenCount > 0 )
         {
-          this.SetNextSelectedIndex();
+          if( this.Root == null )
+          {
+            this.SetNextSelectedIndex();
+          }
+          else
+          {
+            var childrenToSelect = this.Children.OrderByDescending( c => c.LastActivationTimeStamp.GetValueOrDefault() ).First();
+            this.SelectedContentIndex = this.Children.IndexOf( childrenToSelect );
+            childrenToSelect.IsActive = true;
+          }
         }
         else
         {
-          var childrenToSelect = this.Children.OrderByDescending( c => c.LastActivationTimeStamp.GetValueOrDefault() ).First();
-          this.SelectedContentIndex = this.Children.IndexOf( childrenToSelect );
-          childrenToSelect.IsActive = true;
+          if( this.Root != null )
+          {
+            this.Root.ActiveContent = null;
+          }
         }
       }