Changeset 216 for Docking/CoolDocking/Managers/UCDManagerRegions.pas

Timestamp:

Mar 22, 2011, 9:49:17 AM (14 years ago)

Author:

george

Message:

• Added: ConjoinForms caption update.
• Fixed: Docking new clients to TCDManagerRegions in different direction create new sub conjoin form.

File:

• Docking/CoolDocking/Managers/UCDManagerRegions.pas (modified) (4 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -80 +80 @@
     //Canvas.FillRect(R);
     if Visible then begin
-      if ControlPanel.DockClientCount = 0 then
-        Header.DrawGrabber(Canvas, Control) else
-      Header.DrawGrabber(Canvas, ControlPanel);
+      Header.Invalidate;
     end;
   end;
@@ -201 +199 @@
         // Direction change, create conjoin form
         NewConjoinDockForm := CreateContainer(InsertAt);
-        NewDockSite := DockSite.HostDockSite;
-        // FDockSite.ManualFloat(FDockSite.BoundsRect);
-        NewConjoinDockForm.ManualDock(NewDockSite);
-        Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
-        if DockSite is TForm then
-          DockSite.ManualDock(NewConjoinDockForm)
-        else
-        if DockSite is TPanel then
-          DockSite.Parent.ManualDock(NewConjoinDockForm);
+        FreeParentIfEmpty := False;
+        for I := DockSite.DockClientCount - 1 downto 0 do begin
+          DockSite.DockClients[I].ManualDock(NewConjoinDockForm);
+        end;
+        FreeParentIfEmpty := True;
+        NewConjoinDockForm.ManualDock(DockSite);
+        Control.ManualDock(DockSite, nil, InsertAt);
+        NewConjoinDockForm.UpdateCaption;
         UpdateClientSize;
         Exit;
@@ -233 +230 @@
 
   //if TCDManager(Manager).DockSite.DockClientCount = 2 then FDockDirection := ddNone;
-  if ClientCount = 1 then begin
+  if FreeParentIfEmpty and (ClientCount = 1) then begin
     // Last removed control => Free parent if it is TCDConjoinForm
     if Self.DockSite is TCDConjoinForm then
@@ -241 +238 @@
       end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
       ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
+      inherited RemoveControl(Control);
       Free;
+      Exit;
     end;
   end;