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

Timestamp:

Mar 11, 2011, 1:00:06 PM (13 years ago)

Author:

george

Message:

• Removed: UCDClientPanel replaced by TCDManagerItem and it's descendend.

File:

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

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -6 +6 @@
 
 uses
-  Classes, Controls, ExtCtrls, ComCtrls, SysUtils, Dialogs,
-  Menus, Forms, UCDClientPanel, UCDCommon, UCDManager;
+  Classes, Controls, ExtCtrls, ComCtrls, SysUtils, Dialogs, Contnrs,
+  Menus, Forms, UCDCommon, UCDManager,
+  LCLType, LMessages, Graphics;
 
 type
+  TCDManagerTabsITem = class(TCDManagerItem)
+
+  end;
 
   { TCDManagerTabs }
@@ -20 +24 @@
     PageControl: TPageControl;
     TabImageList: TImageList;
+    FDockItems: TObjectList; // TList<TCDManagerRegionsItem>
     procedure TabControlMouseLeave(Sender: TObject);
     procedure TabControlChange(Sender: TObject);
@@ -31 +36 @@
   private
     FTabsPos: THeaderPos;
+    function FindControlInPanels(Control: TControl): TCDManagerItem; override;
     procedure InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
     procedure RemoveControl(Control: TControl); override;
   public
     constructor Create(ADockSite: TWinControl);
+    destructor Destroy; override;
+    procedure PaintSite(DC: HDC); override;
     procedure DoSetVisible(const AValue: Boolean); override;
-    destructor Destroy; override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
     procedure Switch(Index: Integer); override;
@@ -42 +49 @@
     procedure PopupMenuTabCloseClick(Sender: TObject);
     property TabsPos: THeaderPos read FTabsPos write SetTabsPos;
+    property DockItems: TObjectList read FDockItems write FDockItems;
   end;
 
@@ -51 +59 @@
 { TCDManagerTabs }
 
+function TCDManagerTabs.FindControlInPanels(Control: TControl
+  ): TCDManagerItem;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < FDockItems.Count) and
+    (TCDManagerItem(FDockItems[I]).Control <> Control) do Inc(I);
+  if I < FDockItems.Count then Result := TCDManagerItem(FDockItems[I])
+    else Result := nil;
+end;
+
 procedure TCDManagerTabs.PopupMenuTabCloseClick(Sender: TObject);
 begin
   if Assigned(PageControl.ActivePage) then
-    TCDClientPanel(DockPanels[PageControl.TabIndex]).Control.Hide;
+    TCDManagerItem(DockItems[PageControl.TabIndex]).Control.Hide;
 end;
 
@@ -61 +81 @@
   if MouseDown then
   if Assigned(PageControl.ActivePage) then begin
-    TCDClientPanel(DockPanels[PageControl.TabIndex]).ClientAreaPanel.DockSite := False;
-    DragManager.DragStart(TCDClientPanel(DockPanels[PageControl.TabIndex]).Control, False, 1);
+    //TCDManagerItem(DockItems[PageControl.TabIndex]).ClientAreaPanel.DockSite := False;
+    DragManager.DragStart(TCDManagerItem(DockItems[PageControl.TabIndex]).Control, False, 1);
   end;
   MouseDown := False;
@@ -72 +92 @@
 begin
   // Hide all clients
-  for I := 0 to DockPanels.Count - 1 do
-    if TCDClientPanel(DockPanels[I]).Control.Visible
+  for I := 0 to DockItems.Count - 1 do
+    if TCDManagerItem(DockItems[I]).Control.Visible
     //and (PageControl.TabIndex <> I)
     then
     begin
-      TCDClientPanel(DockPanels[I]).Control.Tag := Integer(dhtTemporal);
-      TCDClientPanel(DockPanels[I]).Control.Hide;
-      TCDClientPanel(DockPanels[I]).ClientAreaPanel.Hide;
-      TCDClientPanel(DockPanels[I]).ClientAreaPanel.Parent := PageControl.Pages[I];
+      TCDManagerItem(DockItems[I]).Control.Tag := Integer(dhtTemporal);
+      TCDManagerItem(DockItems[I]).Control.Hide;
+      //TCDClientPanel(DockItems[I]).ClientAreaPanel.Hide;
+      //TCDClientPanel(DockItems[I]).ClientAreaPanel.Parent := PageControl.Pages[I];
       //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Parent := DockSite;
-      TCDClientPanel(DockPanels[I]).Control.Align := alClient;
+      TCDManagerItem(DockItems[I]).Control.Align := alClient;
       //TCDClientPanel(DockPanels[I]).Control.Parent :=
       //  TCDClientPanel(DockPanels[I]).ClientAreaPanel;
       //ShowMessage(TCDClientPanel(DockPanels[I]).Control.ClassName);
-      Application.ProcessMessages;
+      //Application.ProcessMessages;
 
       // Workaround for "Cannot focus" error
-      TForm(TCDClientPanel(DockPanels[I]).Control).ActiveControl := nil;
+      TForm(TCDManagerItem(DockItems[I]).Control).ActiveControl := nil;
     end;
 
   // Show selected
-  if (PageControl.TabIndex <> -1) and (DockPanels.Count > PageControl.TabIndex)
+  if (PageControl.TabIndex <> -1) and (DockItems.Count > PageControl.TabIndex)
 //  and not TCDClientPanel(DockPanels[PageControl.TabIndex]).Control.Visible
   then begin
-    with TCDClientPanel(DockPanels[PageControl.TabIndex]), ClientAreaPanel do begin
+    with TCDManagerItem(DockItems[PageControl.TabIndex]) do begin
       Control.Show;
       (*AutoHide.Enable := True;
@@ -145 +165 @@
   inherited;
   FDockStyle := dsTabs;
+  FDockItems := TObjectList.Create;
+
   TabImageList := TImageList.Create(ADockSite); //FDockSite);
   with TabImageList do begin
@@ -173 +195 @@
   PageControl.Visible := True;
   //TabImageList.Clear;
-  for I := 0 to DockPanels.Count - 1 do
-    Self.InsertControlNoUpdate(TCDClientPanel(DockPanels[I]).Control, alNone);
+  for I := 0 to DockItems.Count - 1 do
+    Self.InsertControlNoUpdate(TCDManagerItem(DockItems[I]).Control, alNone);
   TabControlChange(Self);
 end;
@@ -180 +202 @@
 destructor TCDManagerTabs.Destroy;
 begin
+  FDockItems.Free;
   PageControl.Free;
   TabImageList.Free;
@@ -185 +208 @@
 end;
 
+procedure TCDManagerTabs.PaintSite(DC: HDC);
+var
+  I: Integer;
+begin
+  inherited PaintSite(DC);
+  PageControl.Invalidate;
+end;
+
 procedure TCDManagerTabs.Switch(Index: Integer);
 begin
@@ -193 +224 @@
 var
   NewTabSheet: TTabSheet;
-  NewPanel: TCDClientPanel;
+  NewPanel: TCDManagerTabsItem;
 begin
   inherited;
   begin
-    NewPanel := TCDClientPanel.Create(nil);
+    NewPanel := TCDManagerTabsItem.Create;
     with NewPanel do begin
-      Parent := Self.DockSite;
-      OwnerDockManager := Self;
+      //Panel.Parent := Self.DockSite;
+      Manager := Self;
       if DockStyle = dsList then Visible := True;
-      Align := alClient;
+      //Align := alClient;
       Header.PopupMenu := Self.PopupMenu;
       //PopupMenu.Parent := Self.DockSite;
@@ -211 +242 @@
     NewPanel.Control := AControl;
     AControl.AddHandlerOnVisibleChanged(NewPanel.VisibleChange);
-    AControl.Parent := NewPanel.ClientAreaPanel;
+    //AControl.Parent := NewPanel.ClientAreaPanel;
     AControl.Align := alClient;
     if (InsertAt = alTop) or (InsertAt = alLeft) then
-      DockPanels.Insert(0, NewPanel)
-      else DockPanels.Add(NewPanel);
+      DockItems.Insert(0, NewPanel)
+      else DockItems.Add(NewPanel);
 
   end;
@@ -225 +256 @@
     NewTabSheet.ImageIndex := TabImageList.Count;
     TabImageList.Add(NewPanel.Header.Icon.Picture.Bitmap, nil);
-    if Assigned(NewPanel.Splitter) then
-      NewPanel.Splitter.Visible := False;
-    NewPanel.ClientAreaPanel.Visible := False;
-    NewPanel.Visible := False;
+//    if Assigned(NewPanel.Splitter) then
+//      NewPanel.Splitter.Visible := False;
+//    NewPanel.ClientAreaPanel.Visible := False;
+//    NewPanel.Visible := False;
     //NewPanel.Parent := NewTabSheet;
   end;
@@ -253 +284 @@
 begin
   inherited UpdateClientSize;
-  for I := 0 to DockPanels.Count - 1 do begin
+  for I := 0 to DockItems.Count - 1 do begin
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Width := DockSite.Width;
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Height := DockSite.Height - PageControl.Height;
@@ -263 +294 @@
 begin
   inherited;
-    if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockPanels.Count) then
-      with TCDClientPanel(DockPanels[PageControl.TabIndex]) do begin
+    if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockItems.Count) then
+      with TCDManagerItem(DockItems[PageControl.TabIndex]) do begin
         //Show;
         //ShowMessage(IntToStr(Control.Tag));
@@ -294 +325 @@
         //TabImageList.Delete(PageControl.Tabs.IndexOf(Control.Caption));
 
-        I := DockPanels.IndexOf(FindControlInPanels(Control));
+        I := DockItems.IndexOf(FindControlInPanels(Control));
         if Control.Tag = Integer(dhtPermanent) then
         if I <> -1 then
@@ -308 +339 @@
     begin
 //      if Control.Tag = 0 then begin
-        I := DockPanels.IndexOf(FindControlInPanels(Control));
+        I := DockItems.IndexOf(FindControlInPanels(Control));
         //if  then
         if I <> -1 then