Changeset 186 for Docking/CoolDocking/UCoolDockLayout.pas

Timestamp:

Mar 10, 2011, 1:32:41 PM (13 years ago)

Author:

george

Message:

• Modified: Removed TPanel component from TCoolDockConjoinForm to simplify component structure.

File:

• Docking/CoolDocking/UCoolDockLayout.pas (modified) (6 diffs)

Docking/CoolDocking/UCoolDockLayout.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Contnrs, URectangle, Forms, UCoolDockCommon,
-  DOM, XMLWrite, XMLRead, Controls;
+  DOM, XMLWrite, XMLRead, Controls, Dialogs;
 
 type
@@ -77 +77 @@
 end;
 
+function FindGlobalComponentDeep(Name: string): TComponent;
+var
+  I: Integer;
+begin
+  for I := 0 to Application.ComponentCount - 1 do begin
+    Result := Application.Components[I];
+    if Result.Name = Name then Exit
+      else begin
+        Result := Result.FindComponent(Name);
+        if Assigned(Result) and (Result.Name = Name) then Exit;
+      end;
+  end;
+end;
+
 { TCoolDockLayoutList }
 
@@ -346 +360 @@
     else ParentName := '';
   if Assigned(Form.HostDockSite) then begin
-    if Assigned(Form.HostDockSite.Parent) and (Form.HostDockSite.Parent is TForm) then
+    if Assigned(Form.HostDockSite) then
     begin
-      HostDockSiteName := Form.HostDockSite.Parent.Name;
+      HostDockSiteName := Form.HostDockSite.Name;
       if not Assigned(Parent.FindByName(HostDockSiteName)) then begin
         NewItem := TCoolDockLayoutItem.Create;
         NewItem.Parent := Parent;
-        NewItem.DockStyle := TCoolDockManager(Form.HostDockSite.Parent.DockManager).DockStyle;
+        NewItem.DockStyle := TCoolDockManager(Form.HostDockSite.DockManager).DockStyle;
         Parent.Items.Add(NewItem);
-        NewItem.Store(Form.HostDockSite.Parent);
+        NewItem.Store(Form.HostDockSite);
       end;
     end;
@@ -383 +397 @@
   Form.Visible := Visible;
   if HostDockSiteName <> '' then begin
-    ParentComponent := FindGlobalComponent(HostDockSiteName);
+    ParentComponent := FindGlobalComponentDeep(HostDockSiteName);
     if not Assigned(ParentComponent) then begin
       ParentLayoutItem := Parent.FindByName(HostDockSiteName);
@@ -393 +407 @@
             if FormClass = TCoolDockConjoinForm then begin
               ParentComponent := TCoolDockManager(Form.DockManager).CreateContainer(alNone);
-              TCoolDockManager(TCoolDockConjoinForm(ParentComponent).Panel.DockManager).DockStyle := ParentLayoutItem.DockStyle;
+              TCoolDockManager(TCoolDockConjoinForm(ParentComponent).DockManager).DockStyle := ParentLayoutItem.DockStyle;
               ParentLayoutItem.Restore(TWinControl(ParentComponent));
             end;
@@ -400 +414 @@
       end;
     end;
-    if Assigned(ParentComponent) and (ParentComponent is TCoolDockConjoinForm) then
-      Form.ManualDock(TCoolDockConjoinForm(ParentComponent).Panel);
+    if Assigned(ParentComponent) and (ParentComponent is TWinControl) then
+      Form.ManualDock(TWinControl(ParentComponent));
   end;
   Processed := True;