Merge branch 'master' of https://github.com/Dirkster99/AvalonDock

Dirkster99 · Feb 12, 2022 · 0ba1161 · 0ba1161
2 parents 4500544 + 8e8ee7e
commit 0ba1161
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs b/source/Components/AvalonDock/Controls/LayoutDocumentItem.cs
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
    AvalonDock
 
    Copyright (C) 2007-2013 Xceed Software Inc.
@@ -100,6 +100,11 @@ internal override void Detach()
 			base.Detach();
 		}
 
+		protected override bool CanExecuteDockAsDocumentCommand()
+		{
+			return (LayoutElement != null && LayoutElement.FindParent<LayoutDocumentPane>() != null && LayoutElement.IsFloating);
+		}
+
 		#endregion Overrides
 	}
 }
diff --git a/source/Components/AvalonDock/Layout/LayoutContent.cs b/source/Components/AvalonDock/Layout/LayoutContent.cs
@@ -647,7 +647,6 @@ public void Float()
         public void DockAsDocument()
 		{
 			if (!(Root is LayoutRoot root)) throw new InvalidOperationException();
-			if (Parent is LayoutDocumentPane) return;
 
 			if (PreviousContainer is LayoutDocumentPane)
 			{