Changeset 193 for Docking/CoolDocking/Managers

Timestamp:

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

Author:

george

Message:

• Fixed: Infinite loop in TCDManager SetVisible method.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (10 diffs)
• UCDManagerRegionsPopup.pas (modified) (2 diffs)
• UCDManagerTabs.pas (modified) (16 diffs)
• UCDManagerTabsPopup.pas (modified) (3 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -14 +14 @@
   end;
 
-  { TCDStyleRegions }
-
-  TCDStyleRegions = class(TCDManager)
+  { TCDManagerRegions }
+
+  TCDManagerRegions = class(TCDManager)
   private
     function GetDirection(InsertAt: TAlign): TCDDirection;
@@ -28 +28 @@
     destructor Destroy; override;
     procedure UpdateClientSize; override;
-    procedure DoSetVisible(const AValue: Boolean);
+    procedure DoSetVisible(const AValue: Boolean); override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
     property DockDirection: TCDDirection read FDockDirection
@@ -40 +40 @@
 
 
-{ TCDStyleRegions }
-
-function TCDStyleRegions.GetDirection(InsertAt: TAlign): TCDDirection;
+{ TCDManagerRegions }
+
+function TCDManagerRegions.GetDirection(InsertAt: TAlign): TCDDirection;
 begin
   Result := ddHorizontal;
@@ -53 +53 @@
 end;
 
-procedure TCDStyleRegions.InsertControlPanel(Control: TControl; InsertAt: TAlign;
+procedure TCDManagerRegions.InsertControlPanel(Control: TControl; InsertAt: TAlign;
   DropCtl: TControl);
 var
@@ -107 +107 @@
 end;
 
-procedure TCDStyleRegions.RemoveControl(Control: TControl);
+procedure TCDManagerRegions.RemoveControl(Control: TControl);
 var
   ClientPanel: TCDClientPanel;
@@ -134 +134 @@
 end;
 
-constructor TCDStyleRegions.Create(ADockSite: TWinControl);
-var
-  I: Integer;
-begin
-  inherited;
+constructor TCDManagerRegions.Create(ADockSite: TWinControl);
+var
+  I: Integer;
+begin
+  inherited;
+  FDockStyle := dsList;
   //Panels := TObjectList.Create;
 
@@ -151 +152 @@
 end;
 
-destructor TCDStyleRegions.Destroy;
+destructor TCDManagerRegions.Destroy;
 begin
   //Panels.Free;
@@ -157 +158 @@
 end;
 
-procedure TCDStyleRegions.UpdateClientSize;
+procedure TCDManagerRegions.UpdateClientSize;
 var
   I: Integer;
@@ -200 +201 @@
 end;
 
-procedure TCDStyleRegions.DoSetVisible(const AValue: Boolean);
-var
-  I: Integer;
-begin
-//  inherited SetVisible(AValue);
+procedure TCDManagerRegions.DoSetVisible(const AValue: Boolean);
+var
+  I: Integer;
+begin
+  inherited;
   for I := 0 to DockPanels.Count - 1 do
 
@@ -222 +223 @@
 end;
 
-procedure TCDStyleRegions.ChangeVisible(Control: TWinControl;
+procedure TCDManagerRegions.ChangeVisible(Control: TWinControl;
   Visible: Boolean);
 begin

Docking/CoolDocking/Managers/UCDManagerRegionsPopup.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UCDManagerRegions;
+  Classes, SysUtils, UCDManagerRegions, UCDCommon, Controls;
 
 type
-  TCDStylePopupRegions = class(TCDStyleRegions)
 
+  { TCDStylePopupRegions }
+
+  TCDStylePopupRegions = class(TCDManagerRegions)
+    constructor Create(ADockSite: TWinControl);
   end;
 
@@ -19 +22 @@
   UCDClient;
 
+{ TCDStylePopupRegions }
+
+constructor TCDStylePopupRegions.Create(ADockSite: TWinControl);
+begin
+  inherited;
+  FDockStyle := dsPopupList;
+end;
+
 end.
 

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;

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -40 +40 @@
   { TCDStylePopupTabs }
 
-  TCDStylePopupTabs = class(TCDStyleTabs)
+  TCDStylePopupTabs = class(TCDManagerTabs)
     TabControl: TTabControl;
     TabImageList: TImageList;
@@ -123 +123 @@
 constructor TCDAutoHide.Create;
 begin
+  inherited;
   Timer := TTimer.Create(nil);
   Timer.Enabled := False;
@@ -186 +187 @@
 begin
   inherited;
+  FDockStyle := dsPopupTabs;
 
   AutoHide := TCDAutoHide.Create;