Changeset 217 for Docking/CoolDocking/Managers

Timestamp:

Mar 22, 2011, 11:32:28 AM (14 years ago)

Author:

george

Message:

• Fixed: If control docked to panel owned by main form then it was possible to redock main form to conjoin form.
• Modified: Header title is now painted to canvas instead of use of TLabel. This will be necessary to draw rotated text later.
• Added: Length of header title is now reduced to not overlap to header buttons area.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (5 diffs)
• UCDManagerTabs.pas (modified) (2 diffs)
• UCDManagerTabsPopup.pas (modified) (2 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -90 +90 @@
   PanelHeader.Header.ManagerItem := Self;
   PanelHeader.Header.OnMouseDown := DockPanelMouseDown;
-  PanelHeader.Header.Title.OnMouseDown := DockPanelMouseDown;
   PanelHeader.Header.Icon.OnMouseDown := DockPanelMouseDown;
 
@@ -123 +122 @@
 begin
   inherited SetHeaderPos(AValue);
-  case AValue of
+  if Assigned(DockSite.Parent) then
+    TCDManager(DockSite.Parent.DockManager).UpdateClientSize;
+(*  case AValue of
     hpBottom, hpTop: FDockDirection := ddVertical;
     hpLeft, hpRight: FDockDirection := ddHorizontal;
-  end;
+  end;*)
 end;
 
@@ -172 +173 @@
   NewItem.PanelHeader.Parent := DockSite;
 
-  NewItem.Control := Control;
+  NewItem.Control := TWinControl(Control);
   Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
   Control.Parent := NewItem.PanelHeader.ControlPanel;
@@ -199 +200 @@
         // Direction change, create conjoin form
         NewConjoinDockForm := CreateContainer(InsertAt);
-        FreeParentIfEmpty := False;
-        for I := DockSite.DockClientCount - 1 downto 0 do begin
-          DockSite.DockClients[I].ManualDock(NewConjoinDockForm);
+        try
+          FreeParentIfEmpty := False;
+          for I := DockSite.DockClientCount - 1 downto 0 do begin
+            DockSite.DockClients[I].ManualDock(NewConjoinDockForm);
+          end;
+        finally
+          FreeParentIfEmpty := True;
         end;
-        FreeParentIfEmpty := True;
         NewConjoinDockForm.ManualDock(DockSite);
         Control.ManualDock(DockSite, nil, InsertAt);
@@ -308 +312 @@
     if Assigned(TWinControl(Control).DockManager) then
       PanelHeader.Header.Visible := TCDManager(TWinControl(Control).DockManager).HeaderVisible;
-    PanelHeader.Header.Title.Caption := TForm(Control).Caption;
     PanelHeader.Visible := Control.Visible;
     Paint(Self);

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -254 +254 @@
       NewItem.IconImage.Picture.Assign((Control as TForm).Icon);
 
-    NewItem.Control := Control;
+    NewItem.Control := TWinControl(Control);
     Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
     //AControl.Parent := NewItem.ClientAreaPanel;
@@ -272 +272 @@
   if Assigned(ManagerItem) then begin
     Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
-  end else raise Exception.Create(Format('Control %s not found in DockItems', [Control.Name]));
+  end; //else raise Exception.Create(Format('Control %s not found in DockItems', [Control.Name]));
 
   DockItems.Remove(ManagerItem);

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -246 +246 @@
     C.Align := alClient;
     C.Parent := HeaderPanel.ControlPanel;
-    HeaderPanel.Header.Title.Caption := C.Caption;
     //AutoHide.Control.Align := alCustom;
     //Pos := DockSite.ClientToScreen(Pos);
@@ -328 +327 @@
       NewItem.IconImage.Picture.Assign((Control as TForm).Icon);
 
-    NewItem.Control := Control;
+    NewItem.Control := TWinControl(Control);
     Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
     //AControl.Parent := NewItem.ClientAreaPanel;