Changeset 216 for Docking/CoolDocking/UCDManager.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/UCDManager.pas (modified) (9 diffs)

Docking/CoolDocking/UCDManager.pas

@@ -38 +38 @@
     Icon: TImage;
     ManagerItem: TCDManagerItem;
-    procedure DrawGrabber(Canvas: TCanvas; AControl: TControl);
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -96 +95 @@
     PopupMenu: TCDPopupMenu;
     FDockStyle: TCDStyleType;
+    FreeParentIfEmpty: Boolean; // Free or not parent conjoin forms
     constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
@@ -325 +325 @@
   FDockSite := ADockSite;
 
+  FreeParentIfEmpty := True;
+
   FDockStyle := dsList; // dsNone
   FHeaderVisible := True;
@@ -389 +391 @@
       FDockSite.ManualDock(NewConjoinDockForm);
       Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
+      NewConjoinDockForm.UpdateCaption;
     end else begin
       NewConjoinDockForm := CreateContainer(InsertAt);
@@ -396 +399 @@
       FDockSite.ManualDock(NewConjoinDockForm);
       Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
+      NewConjoinDockForm.UpdateCaption;
     end;
   end else
@@ -401 +405 @@
     InsertControlPanel(Control, InsertAt, DropCtl);
   end;
+  if FDockSite is TCDConjoinForm then
+    TCDConjoinForm(FDockSite).UpdateCaption;
 
 //  FDockPanel.Invalidate;
@@ -451 +457 @@
 procedure TCDManager.RemoveControl(Control: TControl);
 begin
+  if FDockSite is TCDConjoinForm then
+    TCDConjoinForm(FDockSite).UpdateCaption;
 end;
 
@@ -625 +633 @@
 end;
 
-procedure TCDHeader.DrawGrabber(Canvas: TCanvas; AControl: TControl);
-begin
-  with Canvas do begin
-    Brush.Color := clBtnFace;
-    Pen.Color := clBlack;
-    //FillRect(0, 0, AControl.Width, GrabberSize);
-
-    if (AControl as TWinControl).Focused then
-      Title.Font.Style := Font.Style + [fsBold]
-      else Title.Font.Style := Font.Style - [fsBold];
-    Rectangle(1, 1, AControl.Width - 1, GrabberSize - 1);
-    if Icon.Picture.Width > 0 then Title.Left := 8 + Icon.Picture.Width
-      else Title.Left := 6;
-    Title.Caption := AControl.Caption;
-    RearrangeButtons;
-  end;
-end;
-
 procedure TCDHeader.PaintExecute(Sender: TObject);
 const
@@ -653 +643 @@
   Points: array of TPoint;
 begin
+  if (ManagerItem.Control as TWinControl).Focused then
+  Title.Font.Style := Font.Style + [fsBold]
+  else Title.Font.Style := Font.Style - [fsBold];
+
+  if Icon.Picture.Width > 0 then Title.Left := 8 + Icon.Picture.Width
+    else Title.Left := 6;
+  Title.Caption := ManagerItem.Control.Caption;
+  RearrangeButtons;
+
   with Canvas do begin
     GradientFill(Rect(Border, Border, Width - Border,