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

Timestamp:

Mar 22, 2011, 9:49:17 AM (13 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/UCDManagerTabs.pas (modified) (4 diffs)

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);