From 95d8fc70eefe34b031fa64891ff9e0cd93916be5 Mon Sep 17 00:00:00 2001
From: michl <michl@lazarus-ide.org>
Date: Thu, 25 May 2017 20:25:43 +0000
Subject: [PATCH] AnchorDocking: Revert revision 54525 #6139a22bcf as it breaks
 other reloading of AnchorDocking layouts. Issue #31834

git-svn-id: trunk@55083 -
---
 components/anchordocking/anchordocking.pas | 31 ++--------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/components/anchordocking/anchordocking.pas b/components/anchordocking/anchordocking.pas
index b4819c62a5..a7fc9278a8 100644
--- a/components/anchordocking/anchordocking.pas
+++ b/components/anchordocking/anchordocking.pas
@@ -1465,40 +1465,13 @@ function TAnchorDockMaster.CloseUnneededControls(Tree: TAnchorDockLayoutTree
 var
   i: Integer;
   AControl: TControl;
-  TreeNodeControl: TAnchorDockLayoutTreeNode;
-
-  function ParentsIdentical: Boolean;
-  var
-    ParentForm: TCustomForm;
-    ParentAnchorDockLayoutTreeNode: TAnchorDockLayoutTreeNode;
-    Parent1, Parent2: String;
-  begin
-    ParentForm := GetParentForm(AControl, True);
-    if Assigned(ParentForm) then
-      Parent1 := ParentForm.Name
-    else
-      Parent1 := '';
-
-    Parent2 := '';
-    ParentAnchorDockLayoutTreeNode := TreeNodeControl;
-    while Assigned(ParentAnchorDockLayoutTreeNode.Parent) do begin
-      Parent2 := ParentAnchorDockLayoutTreeNode.Name;
-      ParentAnchorDockLayoutTreeNode := ParentAnchorDockLayoutTreeNode.Parent;
-    end;
-    Result := Parent1 = Parent2;
-
-//    DebugLn('TAnchorDockMaster.ParentsIdentical [', Parent1, '] [', Parent2, ']');
-  end;
-
 begin
   i:=ControlCount-1;
   while i>=0 do begin
     AControl:=Controls[i];
-    TreeNodeControl:=Tree.Root.FindChildNode(AControl.Name,true);
     if DockedControlIsVisible(AControl)
-    and (Application.MainForm<>AControl)
-    and ((TreeNodeControl=nil) or not ParentsIdentical)
-    then begin
+    and (Tree.Root.FindChildNode(AControl.Name,true)=nil)
+    and (Application.MainForm<>AControl) then begin
       DisableControlAutoSizing(AControl);
       // AControl is currently on a visible site, but not in the Tree
       // => close site