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

Timestamp:

Mar 11, 2011, 10:57:39 AM (13 years ago)

Author:

george

Message:

• Fixed: Infinite loop in TCDManager SetVisible method.

File:

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

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -11 +11 @@
 type
 
-  { TCDStyleTabs }
-
-  TCDStyleTabs = class(TCDManager)
+  { TCDManagerTabs }
+
+  TCDManagerTabs = class(TCDManager)
   public
     MouseDown: Boolean;
@@ -35 +35 @@
   public
     constructor Create(ADockSite: TWinControl);
-    procedure DoSetVisible(const AValue: Boolean);
+    procedure DoSetVisible(const AValue: Boolean); override;
     destructor Destroy; override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
@@ -49 +49 @@
   UCDClient;
 
-{ TCDStyleTabs }
-
-procedure TCDStyleTabs.PopupMenuTabCloseClick(Sender: TObject);
+{ TCDManagerTabs }
+
+procedure TCDManagerTabs.PopupMenuTabCloseClick(Sender: TObject);
 begin
   if Assigned(PageControl.ActivePage) then
@@ -57 +57 @@
 end;
 
-procedure TCDStyleTabs.TabControlMouseLeave(Sender: TObject);
+procedure TCDManagerTabs.TabControlMouseLeave(Sender: TObject);
 begin
   if MouseDown then
@@ -67 +67 @@
 end;
 
-procedure TCDStyleTabs.TabControlChange(Sender: TObject);
+procedure TCDManagerTabs.TabControlChange(Sender: TObject);
 var
   I: Integer;
@@ -120 +120 @@
 end;
 
-procedure TCDStyleTabs.TabControlMouseDown(Sender: TObject;
+procedure TCDManagerTabs.TabControlMouseDown(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
@@ -130 +130 @@
 end;
 
-procedure TCDStyleTabs.TabControlMouseUp(Sender: TObject;
+procedure TCDManagerTabs.TabControlMouseUp(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
@@ -136 +136 @@
 end;
 
-constructor TCDStyleTabs.Create(ADockSite: TWinControl);
+constructor TCDManagerTabs.Create(ADockSite: TWinControl);
 var
   NewMenuItem: TMenuItem;
@@ -144 +144 @@
 begin
   inherited;
+  FDockStyle := dsTabs;
   TabImageList := TImageList.Create(ADockSite); //FDockSite);
   with TabImageList do begin
@@ -177 +178 @@
 end;
 
-destructor TCDStyleTabs.Destroy;
+destructor TCDManagerTabs.Destroy;
 begin
   PageControl.Free;
@@ -184 +185 @@
 end;
 
-procedure TCDStyleTabs.Switch(Index: Integer);
+procedure TCDManagerTabs.Switch(Index: Integer);
 begin
   PageControl.TabIndex := Index;
 end;
 
-procedure TCDStyleTabs.InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
+procedure TCDManagerTabs.InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
 var
   NewTabSheet: TTabSheet;
@@ -232 +233 @@
 end;
 
-procedure TCDStyleTabs.RemoveControl(Control: TControl);
+procedure TCDManagerTabs.RemoveControl(Control: TControl);
 begin
   inherited RemoveControl(Control);
 end;
 
-procedure TCDStyleTabs.InsertControlPanel(AControl: TControl; InsertAt: TAlign;
+procedure TCDManagerTabs.InsertControlPanel(AControl: TControl; InsertAt: TAlign;
   DropCtl: TControl);
 var
@@ -247 +248 @@
 end;
 
-procedure TCDStyleTabs.UpdateClientSize;
+procedure TCDManagerTabs.UpdateClientSize;
 var
   I: Integer;
@@ -259 +260 @@
 end;
 
-procedure TCDStyleTabs.DoSetVisible(const AValue: Boolean);
-begin
+procedure TCDManagerTabs.DoSetVisible(const AValue: Boolean);
+begin
+  inherited;
     if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockPanels.Count) then
       with TCDClientPanel(DockPanels[PageControl.TabIndex]) do begin
@@ -274 +276 @@
 end;
 
-procedure TCDStyleTabs.ChangeVisible(Control: TWinControl; Visible: Boolean);
+procedure TCDManagerTabs.ChangeVisible(Control: TWinControl; Visible: Boolean);
 var
   I: Integer;
@@ -318 +320 @@
 end;
 
-procedure TCDStyleTabs.SetTabsPos(const AValue: THeaderPos);
+procedure TCDManagerTabs.SetTabsPos(const AValue: THeaderPos);
 begin
   if FTabsPos = AValue then Exit;