Changeset 218 for Docking/CoolDocking/Managers/UCDManagerRegions.pas

Timestamp:

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

Author:

george

Message:

• Fixed: Parent manager tabs switching.

File:

• Docking/CoolDocking/Managers/UCDManagerRegions.pas (modified) (9 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -21 +21 @@
     constructor Create;
     destructor Destroy; override;
+    procedure SetControl(const AValue: TWinControl); override;
   end;
 
@@ -43 +44 @@
     procedure PaintSite(DC: HDC); override;
     procedure UpdateClientSize; override;
-    procedure DoSetVisible(const AValue: Boolean); override;
+    procedure SetVisible(const AValue: Boolean); override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
     property DockDirection: TCDDirection read FDockDirection
@@ -88 +89 @@
 begin
   PanelHeader := TCDPanelHeader.Create(nil);
-  PanelHeader.Header.ManagerItem := Self;
+//  PanelHeader.Header.ManagerItem := Self;
   PanelHeader.Header.OnMouseDown := DockPanelMouseDown;
   PanelHeader.Header.Icon.OnMouseDown := DockPanelMouseDown;
@@ -109 +110 @@
   Control.Parent := nil;
   inherited Destroy;
+end;
+
+procedure TCDManagerRegionsItem.SetControl(const AValue: TWinControl);
+begin
+  inherited SetControl(AValue);
+  PanelHeader.Header.Control := AValue;
 end;
 
@@ -175 +182 @@
   NewItem.Control := TWinControl(Control);
   Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
+  Control.AddHandlerOnVisibleChanging(NewItem.VisibleChanging);
   Control.Parent := NewItem.PanelHeader.ControlPanel;
   Control.Align := alClient;
@@ -199 +207 @@
       if (NewDirection <> FDockDirection) then begin
         // Direction change, create conjoin form
-        NewConjoinDockForm := CreateContainer(InsertAt);
+        NewConjoinDockForm := CreateConjoinForm;
         try
           FreeParentIfEmpty := False;
@@ -228 +236 @@
   if Assigned(ManagerItem) then begin
     Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
+    Control.RemoveHandlerOnVisibleChanging(ManagerItem.VisibleChanging);
   end;
 
@@ -335 +344 @@
 end;
 
-procedure TCDManagerRegions.DoSetVisible(const AValue: Boolean);
+procedure TCDManagerRegions.SetVisible(const AValue: Boolean);
 var
   I: Integer;
@@ -341 +350 @@
   inherited;
   for I := 0 to DockItems.Count - 1 do
-
-        //Show;
-        //ShowMessage(IntToStr(Control.Tag));
       with TCDManagerRegionsItem(DockItems[I]) do begin
         if AValue and (not Control.Visible) and (Control.Tag = Integer(dhtTemporal))  then begin