Changeset 185 for Docking/CoolDocking/UCoolDockLayout.pas

Timestamp:

Mar 10, 2011, 11:20:08 AM (14 years ago)

Author:

george

Message:

• Added: ConjoinForm cleanup if not necessary.

File:

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

Docking/CoolDocking/UCoolDockLayout.pas

@@ -27 +27 @@
     UndockSize: TPoint;
     DockStyle: TDockStyle;
+    Processed: Boolean;
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -391 +392 @@
             FormClass := TFormClass(FindClass('TCoolDockConjoinForm'));
             if FormClass = TCoolDockConjoinForm then begin
-              ParentComponent := TCoolDockConjoinForm.Create(Application);
+              ParentComponent := TCoolDockManager(Form.DockManager).CreateContainer(alNone);
               TCoolDockManager(TCoolDockConjoinForm(ParentComponent).Panel.DockManager).DockStyle := ParentLayoutItem.DockStyle;
               ParentLayoutItem.Restore(TWinControl(ParentComponent));
@@ -401 +402 @@
     if Assigned(ParentComponent) and (ParentComponent is TCoolDockConjoinForm) then
       Form.ManualDock(TCoolDockConjoinForm(ParentComponent).Panel);
-  end else
-  if Assigned(Form.HostDockSite) then Form.ManualFloat(Rect.AsTRect);
+  end;
+  Processed := True;
 end;
 
@@ -509 +510 @@
   I: Integer;
 begin
+  // Undock all forms
+  I := 0;
+  while (I < Application.ComponentCount) do begin
+    if (Application.Components[I] is TForm) then begin
+      Form := (Application.Components[I] as TForm);
+      if Assigned(Form.HostDockSite) then
+        Form.ManualFloat(Rect(Form.Left, Form.Top, Form.Left + Form.Width, Form.Top + Form.Height));
+    end;
+    Inc(I);
+  end;
+
+  for I := 0 to Items.Count - 1 do
+  with TCoolDockLayoutItem(Items[I]) do
+    Processed := False;
+
   for I := 0 to Items.Count - 1 do
   with TCoolDockLayoutItem(Items[I]) do begin
     Form := TForm(Application.FindComponent(Name));
-    if Assigned(Form) then Restore(Form);
+    if Assigned(Form) and (not Assigned(Form.HostDockSite)) and (not Processed) then Restore(Form);
   end;
 end;