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

Timestamp:

Mar 16, 2011, 12:32:41 PM (14 years ago)

Author:

george

Message:

• Fixed: Popup submenus style and position item selection.
• Added: Locking dock managers.
• Modified: Enhanced auto popup tabs handling. Not yet finished.
• Modified: Dock manager position united for all dock manager descendands.

File:

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

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -16 +16 @@
   TCDManagerTabsItem = class(TCDManagerItem)
     Icon: TImage;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
   end;
@@ -23 +23 @@
 
   TCDManagerTabs = class(TCDManager)
-  public
+  private
     MouseDown: Boolean;
     MouseButton: TMouseButton;
     MouseDownSkip: Boolean;
-    PageControl: TPageControl;
-    TabImageList: TImageList;
     FDockItems: TObjectList; // TList<TCDManagerRegionsItem>
     procedure TabControlMouseLeave(Sender: TObject);
-    procedure TabControlChange(Sender: TObject);
     procedure TabControlMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -39 +36 @@
       DropCtl: TControl); override;
     procedure UpdateClientSize; override;
-  private
-    FTabsPos: THeaderPos;
     function FindControlInPanels(Control: TControl): TCDManagerItem; override;
-    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign);
     procedure RemoveControl(Control: TControl); override;
+    function GetHeaderPos: THeaderPos; override;
+    procedure SetHeaderPos(const AValue: THeaderPos); override;
   public
-    constructor Create(ADockSite: TWinControl);
+    TabImageList: TImageList;
+    PageControl: TPageControl;
+    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); virtual;
+    procedure TabControlChange(Sender: TObject); virtual;
+    constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
     procedure PaintSite(DC: HDC); override;
@@ -51 +51 @@
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
     procedure Switch(Index: Integer); override;
-    procedure SetTabsPos(const AValue: THeaderPos);
     procedure PopupMenuTabCloseClick(Sender: TObject);
-    property TabsPos: THeaderPos read FTabsPos write SetTabsPos;
     property DockItems: TObjectList read FDockItems write FDockItems;
   end;
@@ -98 +96 @@
 begin
   if MouseDown then
-  if Assigned(PageControl.ActivePage) then begin
+  if Assigned(PageControl.ActivePage) and not Locked then begin
     //TCDManagerItem(DockItems[PageControl.TabIndex]).ClientAreaPanel.DockSite := False;
     DragManager.DragStart(TCDManagerItem(DockItems[PageControl.TabIndex]).Control, False, 1);
@@ -188 +186 @@
   TabImageList := TImageList.Create(ADockSite); //FDockSite);
   with TabImageList do begin
-    Name := DockSite.Name + 'ImageList';
+    Name := GetUniqueName(DockSite.Name + 'ImageList');
   end;
   PageControl := TPageControl.Create(ADockSite); //FDockSite);
   with PageControl do begin
     Parent := ADockSite;
-    Name := Self.DockSite.Name + 'TabControl';
+    Name := GetUniqueName(Self.DockSite.Name + 'TabControl');
     Visible := True;
     //Align := alTop;
@@ -216 +214 @@
   for I := 0 to ADockSite.DockClientCount - 1 do
     InsertControlNoUpdate(ADockSite.DockClients[I], alNone);
-  TabControlChange(Self);
+  //TabControlChange(Self);
   //TCDManagerTabs(Self).TabControlChange(Self);
 end;
@@ -287 +285 @@
 begin
   inherited RemoveControl(Control);
+end;
+
+function TCDManagerTabs.GetHeaderPos: THeaderPos;
+begin
+  Result := inherited;
+end;
+
+procedure TCDManagerTabs.SetHeaderPos(const AValue: THeaderPos);
+begin
+  inherited SetHeaderPos(AValue);
+  with PageControl do
+  case AValue of
+    hpAuto, hpTop: begin
+      //Align := alTop;
+      TabPosition := tpTop;
+      Height := GrabberSize;
+    end;
+    hpLeft: begin
+      //Align := alLeft;
+      TabPosition := tpLeft;
+      Width := GrabberSize;
+    end;
+    hpRight: begin
+      //Align := alRight;
+      TabPosition := tpRight;
+      Width := GrabberSize;
+    end;
+    hpBottom: begin
+      //Align := alBottom;
+      TabPosition := tpBottom;
+      Height := GrabberSize;
+    end;
+  end;
 end;
 
@@ -376 +407 @@
 end;
 
-procedure TCDManagerTabs.SetTabsPos(const AValue: THeaderPos);
-begin
-  if FTabsPos = AValue then Exit;
-  FTabsPos := AValue;
-  with PageControl do
-  case AValue of
-    hpAuto, hpTop: begin
-      Align := alTop;
-      TabPosition := tpTop;
-      Height := GrabberSize;
-    end;
-    hpLeft: begin
-      Align := alLeft;
-      TabPosition := tpLeft;
-      Width := GrabberSize;
-    end;
-    hpRight: begin
-      Align := alRight;
-      TabPosition := tpRight;
-      Width := GrabberSize;
-    end;
-    hpBottom: begin
-      Align := alBottom;
-      TabPosition := tpBottom;
-      Height := GrabberSize;
-    end;
-  end;
-end;
-
-
 end.