Changeset 186 for Docking/CoolDocking/UCoolDockStyleRegions.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/UCoolDockStyleRegions.pas (modified) (5 diffs)

Docking/CoolDocking/UCoolDockStyleRegions.pas

@@ -74 +74 @@
         // FDockSite.ManualFloat(FDockSite.BoundsRect);
         NewConjoinDockForm.ManualDock(NewDockSite);
-        AControl.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
+        AControl.ManualDock(NewConjoinDockForm, nil, InsertAt);
         if DockSite is TForm then
-          DockSite.ManualDock(NewConjoinDockForm.Panel)
+          DockSite.ManualDock(NewConjoinDockForm)
         else
         if DockSite is TPanel then
-          DockSite.Parent.ManualDock(NewConjoinDockForm.Panel);
+          DockSite.Parent.ManualDock(NewConjoinDockForm);
         UpdateClientSize;
         Exit;
@@ -110 +110 @@
 var
   ClientPanel: TCoolDockClientPanel;
+  ClientCount: Integer;
 begin
   ClientPanel := TCoolDockManager(Manager).FindControlInPanels(Control);
@@ -115 +116 @@
 
   TCoolDockManager(Manager).DockPanels.Remove(ClientPanel);
+  ClientCount := TCoolDockManager(Manager).DockPanels.Count;
 
   //if TCoolDockManager(Manager).DockSite.DockClientCount = 2 then FDockDirection := ddNone;
-  if TCoolDockManager(Manager).DockPanels.Count = 1 then begin
+  if ClientCount = 1 then begin
     // Last removed control => Free parent if it is TCoolDockConjoinForm
-    if TCoolDockManager(Manager).DockSite.Parent is TCoolDockConjoinForm then
-    with TCoolDockConjoinForm(TCoolDockManager(Manager).DockSite.Parent) do begin
+    if TCoolDockManager(Manager).DockSite is TCoolDockConjoinForm then
+    with TCoolDockConjoinForm(TCoolDockManager(Manager).DockSite) do begin
       if Assigned(Parent) then begin
         TCoolDockClientPanel(TCoolDockManager(Manager).DockPanels[0]).Control.ManualDock(HostDockSite);
@@ -129 +131 @@
   end;
   inherited RemoveControl(Control);
+  if ClientCount > 1 then UpdateClientSize;
 end;
 
@@ -191 +194 @@
       else Align := alClient;
 
+    Inc(SplitterLeft, Width);
+    Inc(SplitterTop, Height);
     Splitter.Left := SplitterLeft;
     Splitter.Top := SplitterTop;
-    Inc(SplitterLeft, Width);
-    Inc(SplitterTop, Height);
     Splitter.Parent := TCoolDockManager(Manager).DockSite;
     Splitter.Align := BaseAlign;
     Splitter.Visible := I < (DockPanels.Count - 1);
-
+    Inc(SplitterLeft, Splitter.Width);
+    Inc(SplitterTop, Splitter.Height);
 
     DockPanelPaint(Self);