Changeset 430 for Docking/CoolDocking/Managers/UCDManagerTabs.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/UCDManagerTabs.pas (modified) (9 diffs)

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -75 +75 @@
 destructor TCDManagerTabsItem.Destroy;
 begin
-  IconImage.Free;
-  inherited Destroy;
+  FreeAndNil(IconImage);
+  inherited;
 end;
 
@@ -211 +211 @@
 destructor TCDManagerTabs.Destroy;
 begin
-  FDockItems.Free;
-  PageControl.Free;
-  TabImageList.Free;
-  inherited Destroy;
+  FreeAndNil(FDockItems);
+  FreeAndNil(PageControl);
+  FreeAndNil(TabImageList);
+  inherited;
 end;
 
@@ -221 +221 @@
   I: Integer;
 begin
-  inherited PaintSite(DC);
+  inherited;
   //PageControl.Invalidate;
 end;
@@ -281 +281 @@
         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));
+      if FreeIfEmpty then ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
       //Update;
-      inherited RemoveControl(Control);
-      Free;
+      inherited;
+      if FreeIfEmpty then Free;
       Exit;
     end;
@@ -290 +290 @@
   //if ClientCount > 0 then
   Update;
-  inherited RemoveControl(Control);
+  inherited;
 end;
 
@@ -330 +330 @@
 procedure TCDManagerTabs.BringToFront;
 begin
-  inherited BringToFront;
+  inherited;
   Update;
 end;
@@ -377 +377 @@
   NewTabSheet: TTabSheet;
   DeletedPage: TTabSheet;
-begin
+  LastIndex: Integer;
+begin
+  LastIndex := PageControl.TabIndex;
   if FUpdateCount = 0 then begin
   DebugLog('TCDManagerTabs.Update');
@@ -425 +427 @@
       TCDManager(Control.DockManager).DockSiteVisible := True;
       if not Control.Visible then Control.Show;
+      //PageControl.TabIndex := I;
     end else begin
       TCDManager(Control.DockManager).DockSiteVisible := False;
@@ -436 +439 @@
   end;
   inherited;
+  //ShowMessage(IntToStr(PageControl.TabIndex));
+  PageControl.TabIndex := LastIndex;
 end;