Changeset 216 for Docking/CoolDocking/Managers

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.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (4 diffs)
• UCDManagerTabs.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;

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -90 +90 @@
   // Show current dock clients in parent dock sites
   if TControl(Sender).Visible then
-    TControl(Sender).HostDockSite.Visible := True;
+    if Assigned(TControl(Sender).HostDockSite) then
+      TControl(Sender).HostDockSite.Visible := True;
 
   {Temp := TControl(Sender);
@@ -271 +272 @@
   if Assigned(ManagerItem) then begin
     Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
-  end;
+  end else raise Exception.Create(Format('Control %s not found in DockItems', [Control.Name]));
 
   DockItems.Remove(ManagerItem);
@@ -285 +286 @@
       end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
       ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
+      //UpdateClientSize;
+      inherited RemoveControl(Control);
       Free;
-    end;
-  end else UpdateClientSize;
+      Exit;
+    end;
+  end;
+  //if ClientCount > 0 then
+  UpdateClientSize;
   inherited RemoveControl(Control);
 end;
@@ -346 +352 @@
 
   while PageControl.PageList.Count > DockItems.Count do begin
-    TCDManagerTabsItem(DockItems[I]).Control.Parent := nil;
-    PageControl.Pages[PageControl.PageCount - 1].Parent := nil;
+//    TCDManagerTabsItem(DockItems[DockItems.Count - 1]).Control.Visible := False;
+//    TCDManagerTabsItem(DockItems[DockItems.Count - 1]).Control.Parent := nil;
+    //PageControl.Pages[PageControl.PageCount - 1].Parent := nil;
     PageControl.Pages[PageControl.PageCount - 1].Free;
     TabImageList.Delete(TabImageList.Count - 1);