Changeset 195 for Docking/CoolDocking/Managers

Timestamp:

Mar 11, 2011, 2:16:50 PM (14 years ago)

Author:

george

Message:

 

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (11 diffs)
• UCDManagerTabs.pas (modified) (9 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -15 +15 @@
 
   TCDManagerRegionsItem = class(TCDManagerItem)
-    Panel: TPanel;
+    PanelHeader: TCDPanelHeader;
     Splitter: TSplitter;
-    ClientAreaPanel: TPanel;
     constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -31 +31 @@
     //Panels: TObjectList; // TObjectList<TCDStyleRegionsPanel>
     function FindControlInPanels(Control: TControl): TCDManagerItem; override;
+    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign);
     procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
       DropCtl: TControl); override;
@@ -54 +55 @@
 constructor TCDManagerRegionsItem.Create;
 begin
-  Panel := TPanel.Create(nil);
-
-  ClientAreaPanel := TPanel.Create(Panel);
-  with ClientAreaPanel do begin
-    Parent := Panel;
-    Visible := True;
-    DockSite := True;
-    UseDockManager := True;
-    Align := alClient;
-    BevelInner := bvNone;
-    BevelOuter := bvNone;
-    //Color := clGreen;
-  end;
-  Splitter := TSplitter.Create(Panel);
+  PanelHeader := TCDPanelHeader.Create(nil);
+  PanelHeader.Header.ManagerItem := Self;
+
+  Splitter := TSplitter.Create(nil);
   with Splitter do begin
-    Parent := Panel;
+    //Parent := Panel;
     //Color := clRed;
   end;
+end;
+
+destructor TCDManagerRegionsItem.Destroy;
+begin
+  inherited Destroy;
 end;
 
@@ -100 +96 @@
 end;
 
+procedure TCDManagerRegions.InsertControlNoUpdate(Control: TControl;
+  InsertAt: TAlign);
+var
+  NewItem: TCDManagerRegionsItem;
+begin
+  NewItem := TCDManagerRegionsItem.Create;
+  with NewItem do begin
+    PanelHeader.Parent := Self.DockSite;
+    Manager := Self;
+    if DockStyle = dsList then Visible := True;
+    PanelHeader.Header.PopupMenu := Self.PopupMenu;
+  end;
+  if (Control is TForm) and Assigned((Control as TForm).Icon) then
+    NewItem.PanelHeader.Header.Icon.Picture.Assign((Control as TForm).Icon);
+    NewItem.PanelHeader.Parent := DockSite;
+
+    NewItem.Control := Control;
+    Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
+    Control.Parent := NewItem.PanelHeader.ControlPanel;
+    Control.Align := alClient;
+    if (InsertAt = alTop) or (InsertAt = alLeft) then
+      DockItems.Insert(0, NewItem)
+      else DockItems.Add(NewItem);
+  end;
+
 procedure TCDManagerRegions.InsertControlPanel(Control: TControl; InsertAt: TAlign;
   DropCtl: TControl);
 var
-  NewPanel: TCDManagerRegionsItem;
+  NewItem: TCDManagerRegionsItem;
   I: Integer;
   NewDirection: TCDDirection;
@@ -131 +152 @@
       end;
     end;
-
-    NewPanel := TCDManagerRegionsItem.Create;
-    with NewPanel do begin
-      Panel.Parent := Self.DockSite;
-      Manager := Self;
-      if DockStyle = dsList then Visible := True;
-      Header.PopupMenu := Self.PopupMenu;
-      //PopupMenu.Parent := Self.DockSite;
-    end;
-    if (Control is TForm) and Assigned((Control as TForm).Icon) then
-      NewPanel.Header.Icon.Picture.Assign((Control as TForm).Icon);
-
-    NewPanel.Control := Control;
-    Control.AddHandlerOnVisibleChanged(NewPanel.VisibleChange);
-    Control.Parent := NewPanel.ClientAreaPanel;
-    Control.Align := alClient;
-    if (InsertAt = alTop) or (InsertAt = alLeft) then
-      DockItems.Insert(0, NewPanel)
-      else DockItems.Add(NewPanel);
+    InsertControlNoUpdate(Control, InsertAt);
   end;
   UpdateClientSize;
@@ -156 +159 @@
 procedure TCDManagerRegions.RemoveControl(Control: TControl);
 var
-  ClientPanel: TCDManagerItem;
+  ManagerItem: TCDManagerItem;
   ClientCount: Integer;
 begin
-  ClientPanel := FindControlInPanels(Control);
-  Control.RemoveHandlerOnVisibleChanged(ClientPanel.VisibleChange);
-
-  DockItems.Remove(ClientPanel);
+  ManagerItem := FindControlInPanels(Control);
+  if Assigned(ManagerItem) then
+    Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
+
+  DockItems.Remove(ManagerItem);
   ClientCount := DockItems.Count;
 
@@ -184 +188 @@
 var
   I: Integer;
+  NewItem: TCDManagerRegionsItem;
 begin
   inherited;
@@ -189 +194 @@
   FDockItems := TObjectList.Create;
 
-  for I := 0 to DockItems.Count - 1 do begin
-    if Assigned(TCDManagerRegionsItem(DockItems[I]).Splitter) then
-    with TCDManagerRegionsItem(DockItems[I]) do begin
-      Splitter.Visible := True;
-      Panel.Visible := True;
-      ClientAreaPanel.Parent := TCDManagerRegionsItem(DockItems[I]).Panel;
-      ClientAreaPanel.Visible := True;
-      Control.Visible := True;
-    end;
-  end;
+  for I := 0 to ADockSite.DockClientCount - 1 do
+    InsertControlNoUpdate(ADockSite.DockClients[I], alLeft);
+  UpdateClientSize;
 end;
 
@@ -214 +212 @@
   for I := 0 to FDockItems.Count - 1 do
     with TCDManagerRegionsItem(FDockItems[I]) do begin
-      Panel.Invalidate;
+      PanelHeader.Invalidate;
     end;
 end;
@@ -233 +231 @@
   for I := 0 to DockItems.Count - 1 do
   with TCDManagerRegionsItem(DockItems[I]) do begin
-    Panel.Left := SplitterLeft;
-    Panel.Top := SplitterTop;
-    Panel.Height := Self.DockSite.Height div
+    PanelHeader.Left := SplitterLeft;
+    PanelHeader.Top := SplitterTop;
+    PanelHeader.Height := Self.DockSite.Height div
       Self.DockSite.DockClientCount;
-    Panel.Width := Self.DockSite.Width div
+    PanelHeader.Width := Self.DockSite.Width div
       Self.DockSite.DockClientCount;
     //TCDClientPanel(FDockPanels[I]).DockPanelPaint(Self);
-    if I < (DockItems.Count - 1) then Panel.Align := BaseAlign
-      else Panel.Align := alClient;
-
-    Inc(SplitterLeft, Panel.Width);
-    Inc(SplitterTop, Panel.Height);
+    if I < (DockItems.Count - 1) then PanelHeader.Align := BaseAlign
+      else PanelHeader.Align := alClient;
+
+    Inc(SplitterLeft, PanelHeader.Width);
+    Inc(SplitterTop, PanelHeader.Height);
     Splitter.Left := SplitterLeft;
     Splitter.Top := SplitterTop;
@@ -255 +253 @@
     Paint(Self);
     if I < (DockItems.Count - 1) then begin
-      if DockDirection = ddHorizontal then Panel.Align := alLeft
-        else Panel.Align := alTop;
-    end else Panel.Align := alClient;
+      if DockDirection = ddHorizontal then PanelHeader.Align := alLeft
+        else PanelHeader.Align := alTop;
+    end else PanelHeader.Align := alClient;
   end;
 end;

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -11 +11 @@
 
 type
-  TCDManagerTabsITem = class(TCDManagerItem)
-
+
+  { TCDManagerTabsItem }
+
+  TCDManagerTabsItem = class(TCDManagerItem)
+    Icon: TImage;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -37 +42 @@
     FTabsPos: THeaderPos;
     function FindControlInPanels(Control: TControl): TCDManagerItem; override;
-    procedure InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
+    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign);
     procedure RemoveControl(Control: TControl); override;
   public
@@ -57 +62 @@
   UCDClient;
 
+{ TCDManagerTabsItem }
+
+constructor TCDManagerTabsItem.Create;
+begin
+  Icon := TImage.Create(nil);
+end;
+
+destructor TCDManagerTabsItem.Destroy;
+begin
+  Icon.Free;
+  inherited Destroy;
+end;
+
 { TCDManagerTabs }
 
@@ -91 +109 @@
   I: Integer;
 begin
-  // Hide all clients
+  UpdateClientSize;
+{  // Hide all clients
   for I := 0 to DockItems.Count - 1 do
     if TCDManagerItem(DockItems[I]).Control.Visible
@@ -137 +156 @@
   //TCDClientPanel(FDockPanels[TabControl.TabIndex]).Visible := True;
   end;
-  MouseDownSkip := True;
+  MouseDownSkip := True;        }
 end;
 
@@ -175 +194 @@
     Parent := ADockSite;
     Name := Self.DockSite.Name + 'TabControl';
-    Visible := False;
-    Align := alTop;
+    Visible := True;
+    //Align := alTop;
     //Height := 24;
     Align := alClient;
@@ -193 +212 @@
   //MoveDuration := 1000; // ms
 
-  PageControl.Visible := True;
+  //PageControl.Visible := True;
   //TabImageList.Clear;
-  for I := 0 to DockItems.Count - 1 do
-    Self.InsertControlNoUpdate(TCDManagerItem(DockItems[I]).Control, alNone);
+  for I := 0 to ADockSite.DockClientCount - 1 do
+    InsertControlNoUpdate(ADockSite.DockClients[I], alNone);
   TabControlChange(Self);
+  //TCDManagerTabs(Self).TabControlChange(Self);
 end;
 
@@ -221 +241 @@
 end;
 
-procedure TCDManagerTabs.InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
+procedure TCDManagerTabs.InsertControlNoUpdate(Control: TControl; InsertAt: TAlign);
 var
   NewTabSheet: TTabSheet;
-  NewPanel: TCDManagerTabsItem;
+  NewItem: TCDManagerTabsItem;
 begin
   inherited;
   begin
-    NewPanel := TCDManagerTabsItem.Create;
-    with NewPanel do begin
+    NewItem := TCDManagerTabsItem.Create;
+    with NewItem do begin
       //Panel.Parent := Self.DockSite;
       Manager := Self;
-      if DockStyle = dsList then Visible := True;
+      //if DockStyle = dsList then Visible := True;
       //Align := alClient;
-      Header.PopupMenu := Self.PopupMenu;
+      //Header.PopupMenu := Self.PopupMenu;
       //PopupMenu.Parent := Self.DockSite;
     end;
-    if (AControl is TForm) and Assigned((AControl as TForm).Icon) then
-      NewPanel.Header.Icon.Picture.Assign((AControl as TForm).Icon);
-
-    NewPanel.Control := AControl;
-    AControl.AddHandlerOnVisibleChanged(NewPanel.VisibleChange);
-    //AControl.Parent := NewPanel.ClientAreaPanel;
-    AControl.Align := alClient;
+    if (Control is TForm) and Assigned((Control as TForm).Icon) then
+      NewItem.Icon.Picture.Assign((Control as TForm).Icon);
+
+    NewItem.Control := Control;
+    Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
+    //AControl.Parent := NewItem.ClientAreaPanel;
+    Control.Align := alClient;
     if (InsertAt = alTop) or (InsertAt = alLeft) then
-      DockItems.Insert(0, NewPanel)
-      else DockItems.Add(NewPanel);
-
-  end;
-
-  if AControl.Visible then begin
+      DockItems.Insert(0, NewItem)
+      else DockItems.Add(NewItem);
+
+  end;
+
     NewTabSheet := TTabSheet.Create(PageControl);
     NewTabSheet.PageControl := PageControl;
-    NewTabSheet.Caption := AControl.Caption;
+    NewTabSheet.Caption := Control.Caption;
     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;
-    //NewPanel.Parent := NewTabSheet;
-  end;
+    NewTabSheet.TabVisible := Control.Visible;
+    Control.Parent := NewTabSheet;
+    TabImageList.Add(NewItem.Icon.Picture.Bitmap, nil);
+//    if Assigned(NewItem.Splitter) then
+//      NewItem.Splitter.Visible := False;
+//    NewItem.ClientAreaPanel.Visible := False;
+//    NewItem.Visible := False;
+    //NewItem.Parent := NewTabSheet;
 end;
 
@@ -282 +302 @@
 var
   I: Integer;
+  NewTabSheet: TTabSheet;
 begin
   inherited UpdateClientSize;
-  for I := 0 to DockItems.Count - 1 do begin
+  for I := 0 to DockItems.Count - 1 do
+  with TCDManagerTabsItem(DockItems[I]) do begin
+    Control.Parent := PageControl.Pages[I];
+    Control.Align := alClient;
+
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Width := DockSite.Width;
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Height := DockSite.Height - PageControl.Height;