Changeset 208 for Docking/CoolDocking/Managers

Timestamp:

Mar 18, 2011, 1:24:37 PM (14 years ago)

Author:

george

Message:

• Fixed: Controls docked in Popup Tabs Manager was not removed due wrong RemoveControl method inheritance.
• Fixed: Tabs in Tabs manager was not update properly.
• Added: HeaderPos stored in Layout.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerTabs.pas (modified) (10 diffs)
• UCDManagerTabsPopup.pas (modified) (8 diffs)

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -7 +7 @@
 uses
   Classes, Controls, ExtCtrls, ComCtrls, SysUtils, Dialogs, Contnrs,
-  Menus, Forms, UCDCommon, UCDManager,
+  Menus, Forms, UCDCommon, UCDManager, UCDConjoinForm,
   LCLType, LMessages, Graphics;
 
@@ -15 +15 @@
 
   TCDManagerTabsItem = class(TCDManagerItem)
-    Icon: TImage;
+    IconImage: TImage;
     constructor Create; override;
     destructor Destroy; override;
@@ -36 +36 @@
     procedure UpdateClientSize; override;
     function FindControlInPanels(Control: TControl): TCDManagerItem; override;
-    procedure RemoveControl(Control: TControl); override;
     function GetHeaderPos: THeaderPos; override;
   public
@@ -44 +43 @@
     procedure SetHeaderPos(const AValue: THeaderPos); override;
     procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); virtual;
-    procedure TabControlChange(Sender: TObject); virtual;
+    procedure RemoveControl(Control: TControl); override;
     constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
+    procedure TabControlChange(Sender: TObject); virtual;
     procedure PaintSite(DC: HDC); override;
     procedure DoSetVisible(const AValue: Boolean); override;
@@ -64 +64 @@
 constructor TCDManagerTabsItem.Create;
 begin
-  Icon := TImage.Create(nil);
+  IconImage := TImage.Create(nil);
 end;
 
 destructor TCDManagerTabsItem.Destroy;
 begin
-  Icon.Free;
+  IconImage.Free;
   inherited Destroy;
 end;
@@ -107 +107 @@
   I: Integer;
 begin
-  UpdateClientSize;
+  //UpdateClientSize;
 {  // Hide all clients
   for I := 0 to DockItems.Count - 1 do
@@ -249 +249 @@
     NewItem := TCDManagerTabsItem.Create;
     with NewItem do begin
-      //Panel.Parent := Self.DockSite;
       Manager := Self;
-      //if DockStyle = dsList then Visible := True;
-      //Align := alClient;
-      //Header.PopupMenu := Self.PopupMenu;
-      //PopupMenu.Parent := Self.DockSite;
     end;
     if (Control is TForm) and Assigned((Control as TForm).Icon) then
-      NewItem.Icon.Picture.Assign((Control as TForm).Icon);
+      NewItem.IconImage.Picture.Assign((Control as TForm).Icon);
 
     NewItem.Control := Control;
@@ -266 +261 @@
       DockItems.Insert(0, NewItem)
       else DockItems.Add(NewItem);
-
-  end;
-
-    NewTabSheet := TTabSheet.Create(PageControl);
-    NewTabSheet.PageControl := PageControl;
-    NewTabSheet.Caption := Control.Caption;
-    NewTabSheet.ImageIndex := TabImageList.Count;
-    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;
 end;
 
 procedure TCDManagerTabs.RemoveControl(Control: TControl);
-begin
+var
+  ManagerItem: TCDManagerItem;
+  ClientCount: Integer;
+begin
+  ManagerItem := FindControlInPanels(Control);
+  if Assigned(ManagerItem) then begin
+    Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
+  end;
+
+  DockItems.Remove(ManagerItem);
+  ClientCount := DockItems.Count;
+
+  //if TCDManager(Manager).DockSite.DockClientCount = 2 then FDockDirection := ddNone;
+  if ClientCount = 1 then begin
+    // Last removed control => Free parent if it is TCDConjoinForm
+    if Self.DockSite is TCDConjoinForm then
+    with TCDConjoinForm(Self.DockSite) do begin
+      if Assigned(Parent) then begin
+        TCDManagerItem(DockItems[0]).Control.ManualDock(HostDockSite);
+      end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
+      ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
+      Free;
+    end;
+  end;
   inherited RemoveControl(Control);
+  if ClientCount > 1 then UpdateClientSize;
 end;
 
@@ -328 +333 @@
   inherited;
   InsertControlNoUpdate(AControl, InsertAt);
-  TabControlChange(Self);
+  UpdateClientSize;
 end;
 
@@ -336 +341 @@
   NewTabSheet: TTabSheet;
 begin
-  inherited UpdateClientSize;
   for I := 0 to DockItems.Count - 1 do
   with TCDManagerTabsItem(DockItems[I]) do begin
+    Control.Visible := False;
+    Control.Parent := nil;
+  end;
+
+  while PageControl.PageList.Count > DockItems.Count do begin
+    PageControl.Pages[PageControl.PageCount - 1].Parent := nil;
+    PageControl.Pages[PageControl.PageCount - 1].Free;
+    TabImageList.Delete(TabImageList.Count - 1);
+  end;
+  while PageControl.PageList.Count < DockItems.Count do begin
+    NewTabSheet := TTabSheet.Create(PageControl);
+    NewTabSheet.PageControl := PageControl;
+    TabImageList.Add(TCDManagerTabsItem(DockItems[PageControl.PageList.Count - 1]).IconImage.Picture.Bitmap, nil);
+  end;
+
+  for I := 0 to DockItems.Count - 1 do
+  with TCDManagerTabsItem(DockItems[I]) do begin
+    PageControl.Pages[I].Caption := Control.Caption;
+    PageControl.Pages[I].ImageIndex := TabImageList.Count;
+    TabImageList.Replace(I, IconImage.Picture.Bitmap, nil);
     Control.Parent := PageControl.Pages[I];
     Control.Align := alClient;
-
+    Control.Visible := True;
+    PageControl.Pages[I].TabVisible := Control.Visible;
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Width := DockSite.Width;
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Height := DockSite.Height - PageControl.Height;
     //TCDClientPanel(FDockPanels[I]).DockPanelPaint(Self);
   end;
+  inherited UpdateClientSize;
 end;
 

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -65 +65 @@
     procedure UpdatePopupFormBounds;
     procedure TabControlChange(Sender: TObject); override;
+    procedure PopupFormMouseLeave(Sender: TObject);
   public
     AutoHideEnabled: Boolean;
@@ -71 +72 @@
     HeaderPanel: TCDPanelHeader;
     Splitter: TPanel;
+    procedure RemoveControl(Control: TControl); override;
     procedure SetHeaderPos(const AValue: THeaderPos); override;
     procedure PinShowButtonClick(Sender: TObject);
@@ -253 +255 @@
 end;
 
+procedure TCDManagerTabsPopup.PopupFormMouseLeave(Sender: TObject);
+begin
+  if PopupForm.Visible then AutoHide.Hide;
+end;
+
+procedure TCDManagerTabsPopup.RemoveControl(Control: TControl);
+begin
+  if DockItems.Count <= 2 then
+    PageControl.OnResize := nil;
+  inherited;
+end;
+
 constructor TCDManagerTabsPopup.Create(ADockSite: TWinControl);
 var
@@ -263 +277 @@
   PopupForm.Visible := True;
   PopupForm.BorderStyle := bsNone;
+  PopupForm.OnMouseLeave := PopupFormMouseLeave;
   HeaderPanel := TCDPanelHeader.Create(nil);
   HeaderPanel.Parent := PopupForm;
@@ -276 +291 @@
   AutoHide.Control := PopupForm;
   PageControl.OnResize := PageControlResize;
+  HeaderVisible := False;
 
   for I := 0 to DockItems.Count - 1 do begin
@@ -288 +304 @@
   AutoHide.Free;
   PopupForm.Free;
+  Splitter.Free;
   HeaderPanel.Free;
   inherited Destroy;
@@ -306 +323 @@
     NewItem := TCDManagerTabsPopupItem.Create;
     with NewItem do begin
-      //Panel.Parent := Self.DockSite;
       Manager := Self;
-      //if DockStyle = dsList then Visible := True;
-      //Align := alClient;
-      //Header.PopupMenu := Self.PopupMenu;
-      //PopupMenu.Parent := Self.DockSite;
     end;
     if (Control is TForm) and Assigned((Control as TForm).Icon) then
-      NewItem.Icon.Picture.Assign((Control as TForm).Icon);
+      NewItem.IconImage.Picture.Assign((Control as TForm).Icon);
 
     NewItem.Control := Control;
@@ -323 +335 @@
       DockItems.Insert(0, NewItem)
       else DockItems.Add(NewItem);
-
-  end;
-
-    NewTabSheet := TTabSheet.Create(PageControl);
-    NewTabSheet.PageControl := PageControl;
-    NewTabSheet.Caption := Control.Caption;
-    NewTabSheet.ImageIndex := TabImageList.Count;
-    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;
 end;