Merge pull request #103 from scdmitryvodich/DockedPaneNotVisible

Fix #101 and new fix for #81 with docked pane becomes not visible.
Dirkster99 · Jan 21, 2020 · 41a7bc9 · 41a7bc9
2 parents a7cae4c + 3c30617
commit 41a7bc9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/source/Components/AvalonDock/Controls/LayoutGridControl.cs b/source/Components/AvalonDock/Controls/LayoutGridControl.cs
@@ -600,10 +600,6 @@ public virtual void AdjustFixedChildrenPanelSizes(Size? parentSize = null)
 			{
 				child.AdjustFixedChildrenPanelSizes(availableSize);
 			}
-
-			// #81 - Make parents update their children up the tree. Otherwise, they will not be redrawn.
-			if (parentSize == null)
-				_model.RaiseChildrenTreeChanged();
 		}
 
 		private FrameworkElement GetNextVisibleChild(int index)

diff --git a/source/Components/AvalonDock/Layout/LayoutGroup.cs b/source/Components/AvalonDock/Layout/LayoutGroup.cs
@@ -268,7 +268,17 @@ private void _children_CollectionChanged(object sender, System.Collections.Speci
 
 			ComputeVisibility();
 			OnChildrenCollectionChanged();
-			NotifyChildrenTreeChanged(ChildrenTreeChange.DirectChildrenChanged);
+
+			if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
+			{
+				// #81 - Make parents update their children up the tree. Otherwise, they will not be redrawn.
+				RaiseChildrenTreeChanged();
+			}
+			else
+			{
+				NotifyChildrenTreeChanged(ChildrenTreeChange.DirectChildrenChanged);
+			}
+
 			RaisePropertyChanged("ChildrenCount");
 		}