Changeset 218 for Docking/CoolDocking/UCDManager.pas

Timestamp:

Mar 23, 2011, 12:22:26 PM (13 years ago)

Author:

george

Message:

• Fixed: Parent manager tabs switching.

File:

• Docking/CoolDocking/UCDManager.pas (modified) (21 diffs)

Docking/CoolDocking/UCDManager.pas

@@ -16 +16 @@
   TCDManager = class;
   TCDManagerItem = class;
+
+  TCDPanelForm = class(TForm)
+    Panel: TPanel;
+  end;
 
   { TCDHeaderButton }
@@ -37 +41 @@
     Buttons: TObjectList; // TList<TCDHeaderButton>
     Icon: TImage;
-    ManagerItem: TCDManagerItem;
+    Control: TControl;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -63 +67 @@
   TCDManagerItem = class
   private
+    FControl: TWinControl;
     function GetHideType: TCDHideType;
     procedure ResizeExecute(Sender: TObject);
     procedure SetHideType(const AValue: TCDHideType);
   public
-    Control: TWinControl;
     Manager: TCDManager;
+    procedure SetControl(const AValue: TWinControl); virtual;
     procedure DockPanelMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure Paint(Sender: TObject); virtual;
     procedure VisibleChange(Sender: TObject); virtual;
+    procedure VisibleChanging(Sender: TObject); virtual;
     constructor Create; virtual;
     destructor Destroy; override;
     property HideType: TCDHideType read GetHideType write SetHideType;
+    property Control: TWinControl read FControl write SetControl;
   end;
 
@@ -90 +97 @@
     procedure SetHeaderVisible(const AValue: Boolean);
     procedure SetMoveDuration(const AValue: Integer);
-    procedure SetVisible(const AValue: Boolean);
   public
     Locked: Boolean;
@@ -96 +102 @@
     FDockStyle: TCDStyleType;
     FreeParentIfEmpty: Boolean; // Free or not parent conjoin forms
+    procedure SetVisible(const AValue: Boolean); virtual;
     constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
@@ -104 +111 @@
     procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
       DropCtl: TControl); virtual;
-    procedure DoSetVisible(const AValue: Boolean); virtual;
     procedure SetHeaderPos(const AValue: THeaderPos); virtual;
     function GetHeaderPos: THeaderPos; virtual;
@@ -130 +136 @@
 
     function FindControlInPanels(Control: TControl): TCDManagerItem; virtual;
-    function CreateContainer(InsertAt: TAlign): TCDConjoinForm;
+    function CreateConjoinForm: TCDConjoinForm;
+    function CreateDockableForm: TCDPanelForm;
     property DockStyle: TCDStyleType read FDockStyle write SetDockStyle;
     property MoveDuration: Integer read GetMoveDuration write SetMoveDuration;
@@ -144 +151 @@
 uses
   UCDManagerRegions, UCDManagerTabs, UCDManagerRegionsPopup, UCDManagerTabsPopup,
-  UCDResource;
+  UCDResource, UCDClient;
 
 function CreateRotatedFont(F: TFont; Angle: Integer): Integer;
@@ -281 +288 @@
 end;
 
+procedure TCDManagerItem.SetControl(const AValue: TWinControl);
+begin
+  if FControl = AValue then Exit;
+  FControl := AValue;
+end;
+
 procedure TCDManagerItem.SetHideType(const AValue: TCDHideType);
 begin
@@ -314 +327 @@
 end;
 
+procedure TCDManagerItem.VisibleChanging(Sender: TObject);
+begin
+
+end;
+
 { TCDManager }
 
@@ -388 +406 @@
   DropCtl: TControl);
 begin
-end;
-
-procedure TCDManager.DoSetVisible(const AValue: Boolean);
-begin
-
 end;
 
@@ -409 +422 @@
     if (not Assigned(FDockSite.Parent)) then begin
       // Create conjointed form
-      NewConjoinDockForm := CreateContainer(InsertAt);
+      NewConjoinDockForm := CreateConjoinForm;
       FDockSite.ManualDock(NewConjoinDockForm);
       Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
       NewConjoinDockForm.UpdateCaption;
     end else begin
-      NewConjoinDockForm := CreateContainer(InsertAt);
+      NewConjoinDockForm := CreateConjoinForm;
       NewDockSite := FDockSite.HostDockSite;
 //      FDockSite.ManualFloat(FDockSite.BoundsRect);
@@ -504 +517 @@
 end;
 
-function TCDManager.CreateContainer(InsertAt: TAlign): TCDConjoinForm;
+function TCDManager.CreateConjoinForm: TCDConjoinForm;
 var
   NewDockSite: TWinControl;
@@ -511 +524 @@
   NewConjoinDockForm := TCDConjoinForm.Create(Application);
   NewConjoinDockForm.Name := GetUniqueName('ConjoinForm');
-  NewConjoinDockForm.Visible := True;
+  //NewConjoinDockForm.Visible := True;
   NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
   NewConjoinDockForm.CoolDockClient.Master := Self.Master;
@@ -518 +531 @@
   //NewConjoinDockForm.ManualDock(NewDockSite, nil, InsertAt);
   Result := NewConjoinDockForm;
+end;
+
+function TCDManager.CreateDockableForm: TCDPanelForm;
+var
+  NewClient: TCDClient;
+begin
+  Application.CreateForm(TCDPanelForm, Result);
+  Result.Name := GetUniqueName('DockForm');
+  NewClient := TCDClient.Create(Result);
+  Result.Panel := TPanel.Create(Result);
+  Result.Panel.Parent := Result;
+  //Result.Panel.Visible := True;
+  Result.Panel.BevelInner := bvNone;
+  Result.Panel.BevelOuter := bvNone;
+  NewClient.Panel := Result.Panel;
+  NewClient.Master := Self.Master;
+  NewClient.Dockable := False;
 end;
 
@@ -564 +594 @@
 
 procedure TCDManager.SetVisible(const AValue: Boolean);
-var
-  I: Integer;
-begin
-  DoSetVisible(AValue);
-  //Visible := AValue;
-//  for I := 0 to DockPanels.Count - 1 do
-//    TCDClientPanel(DockPanels[I]).Visible := AValue;
+begin
 end;
 
@@ -638 +662 @@
     Visible := True;
   end;
+
+  BevelInner := bvNone;
+  BevelOuter := bvNone;
 end;
 
@@ -662 +689 @@
   R: TRect;
 begin
-  with TCDManager(TWinControl(ManagerItem.Control).DockManager) do
+  if Assigned(Control) then
+  with TCDManager(TWinControl(Control).DockManager) do
   case HeaderPos of
     hpLeft: begin
@@ -682 +710 @@
   end;
 
-  if (ManagerItem.Control as TWinControl).Focused then
-  Canvas.Font.Style := Canvas.Font.Style + [fsBold]
-  else Canvas.Font.Style := Canvas.Font.Style - [fsBold];
+  if Assigned(Control) then
+    if (Control as TWinControl).Focused then
+      Canvas.Font.Style := Canvas.Font.Style + [fsBold]
+        else Canvas.Font.Style := Canvas.Font.Style - [fsBold];
 
   RearrangeButtons;
@@ -737 +766 @@
 
     //SelectObject(Canvas.Handle, MyFont);
-    Title := ManagerItem.Control.Caption;
+    if Assigned(Control) then
+      Title := Control.Caption else Title := '';
     if (TextWidth(Title) > TitleMaxWidth) then begin
       while (Length(Title) > 0) and (TextWidth(Title + '...') > TitleMaxWidth) do begin
@@ -776 +806 @@
 procedure TCDHeader.CloseButtonClick(Sender: TObject);
 begin
-  ManagerItem.Control.Hide;
-end;
-
-
+  if Assigned(Control) then
+    Control.Hide;
+end;
 
 end.