Changeset 244 for Docking/CoolDocking/Managers/UCDManagerTabs.pas

Timestamp:

May 19, 2011, 3:14:19 PM (13 years ago)

Author:

george

Message:

• Fixed: Tab removing from PageControl in ManagerTabs.
• Fixed: Infinite loop in calling invalidate for ManagerTabs.
• Modified: Enhanced TRectangle class.

File:

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

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -218 +218 @@
 begin
   inherited PaintSite(DC);
-  PageControl.Invalidate;
+  //PageControl.Invalidate;
 end;
 
@@ -333 +333 @@
   I: Integer;
   NewTabSheet: TTabSheet;
+  DeletedPage: TTabSheet;
 begin
   for I := 0 to DockItems.Count - 1 do
@@ -338 +339 @@
     //Control.Tag := Integer(dhtTemporal);
     //Control.Visible := False;
-    //Control.Parent := nil;
+    //if I >= DockItems.Count then
+    //  Control.Parent := nil;
   end;
 
@@ -344 +346 @@
 //    TCDManagerTabsItem(DockItems[DockItems.Count - 1]).Control.Visible := False;
 //    TCDManagerTabsItem(DockItems[DockItems.Count - 1]).Control.Parent := nil;
-    //PageControl.Pages[PageControl.PageCount - 1].Parent := nil;
-    PageControl.Pages[PageControl.PageCount - 1].Free;
+
+    PageControl.OnChange := nil;
+    DeletedPage := PageControl.Pages[PageControl.PageCount - 1];
+    DeletedPage.Parent := nil;
+    PageControl.OnChange := TabControlChange;
+    DeletedPage.Free;
     TabImageList.Delete(TabImageList.Count - 1);
   end;
@@ -359 +365 @@
     PageControl.Pages[I].ImageIndex := I;
     TabImageList.Replace(I, IconImage.Picture.Bitmap, nil);
+    //if (I < PageControl.PageCount) and Assigned(PageControl.Pages[I]) then
     Control.Parent := PageControl.Pages[I];
     Control.Align := alClient;