Changeset 437 for Docking/CoolDocking/UCDManager.pas

Timestamp:

Nov 19, 2012, 2:34:58 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Better switching tabbed controls.

File:

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

Docking/CoolDocking/UCDManager.pas

@@ -104 +104 @@
     procedure SetMoveDuration(const AValue: Integer);
     procedure CloseHandler(Sender: TObject; var CloseAction: TCloseAction);
+  protected
+    procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
+      DropCtl: TControl); virtual;
+    function GetHeaderPos: THeaderPos; virtual;
+    function FindControlInPanels(Control: TControl): TCDManagerItem; virtual;
   public
     Locked: Boolean;
@@ -114 +119 @@
     procedure Switch(Index: Integer); virtual;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean); virtual;
-    procedure Assign(Source: TCDManager); virtual;
-    procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
-      DropCtl: TControl); virtual;
-    function GetHeaderPos: THeaderPos; virtual;
+    procedure Assign(Source: TPersistent); override;
     procedure BringToFront; virtual;
 
@@ -141 +143 @@
     function AutoFreeByControl: Boolean; override;
 
-    function FindControlInPanels(Control: TControl): TCDManagerItem; virtual;
     function CreateConjoinForm: TCDConjoinForm;
     function CreateDockableForm: TCDPanelForm;
@@ -364 +365 @@
 function TCDManager.GetMoveDuration: Integer;
 begin
-
+  Result := 0;
 end;
 
@@ -379 +380 @@
 
 constructor TCDManager.Create(ADockSite: TWinControl);
-var
-  NewMenuItem: TMenuItem;
-  NewMenuItem2: TMenuItem;
 begin
   inherited Create(ADockSite);
@@ -524 +522 @@
 
 procedure TCDManager.ResetBounds(Force: Boolean);
-var
-  I: Integer;
-  Control: TControl;
-  R: TRect;
 begin
 end;
@@ -552 +546 @@
   NewConjoinDockForm := TCDConjoinForm.Create(Application);
   NewConjoinDockForm.Name := GetUniqueName('ConjoinForm');
-  NewConjoinDockForm.Visible := True;
+  NewConjoinDockForm.Visible := False;
   NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
   NewConjoinDockForm.CoolDockClient.Master := Self.Master;
@@ -580 +574 @@
 procedure TCDManager.SetDockStyle(const AValue: TCDStyleType);
 var
-  I: Integer;
   NewManager: TCDManager;
 begin
@@ -646 +639 @@
 end;
 
-procedure TCDManager.Assign(Source: TCDManager);
-begin
-  FDockStyle := Source.FDockStyle;
-  FDockSite := Source.FDockSite;
+procedure TCDManager.Assign(Source: TPersistent);
+begin
+  if Source is TCDManager then begin
+    FDockStyle := TCDManager(Source).FDockStyle;
+    FDockSite := TCDManager(Source).FDockSite;
+  end else inherited;
 end;
 
@@ -718 +713 @@
   Points: array of TPoint;
   TitleLeft: Integer;
-  TitleWidth: Integer;
   TitleMaxWidth: Integer;
   I: Integer;