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

Timestamp:

Oct 17, 2012, 1:24:58 PM (12 years ago)

Author:

chronos

Message:

• Fixed: CoolDock show wrong tab focused if tab was invisible.

File:

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

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -22 +22 @@
     procedure Paint(Sender: TObject); override;
     procedure PanelResize(Sender: TObject);
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
     procedure SetControl(const AValue: TWinControl); override;
@@ -34 +34 @@
     FDockItems: TObjectList; // TList<TCDManagerRegionsItem>
     FLastVisibleItemsCount: Integer;
-    function GetHeaderPos: THeaderPos; override;
-    procedure SetHeaderPos(const AValue: THeaderPos); override;
     function GetDirection(InsertAt: TAlign): TCDDirection;
     procedure ResizePanels;
@@ -43 +41 @@
   protected
     FDockDirection: TCDDirection;
+    procedure SetHeaderPos(const AValue: THeaderPos); override;
   public
     //Panels: TObjectList; // TObjectList<TCDStyleRegionsPanel>
+    function GetHeaderPos: THeaderPos; override;
     procedure BringToFront; override;
     function FindControlInPanels(Control: TControl): TCDManagerItem; override;
@@ -136 +136 @@
   PanelHeader.Free;
   Splitter.Parent := nil;
-  Splitter.Free;
+  FreeAndNil(Splitter);
   if Assigned(Control) then Control.Parent := nil;
-  inherited Destroy;
+  inherited;
 end;
 
 procedure TCDManagerRegionsItem.SetControl(const AValue: TWinControl);
 begin
-  inherited SetControl(AValue);
+  inherited;
   PanelHeader.Header.Control := AValue;
 end;
@@ -365 +365 @@
         TCDManagerItem(DockItems[0]).Control.ManualDock(HostDockSite);
       end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
-      ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
-      inherited RemoveControl(Control);
-      Free;
+      if FreeIfEmpty then ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
+      inherited;
+      if FreeIfEmpty then Free;
       Exit;
     end;
   end;
-  inherited RemoveControl(Control);
+  inherited;
   if ClientCount > 1 then Update;
 end;