Changeset 208 for Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

Timestamp:

Mar 18, 2011, 1:24:37 PM (13 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.

File:

• Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas (modified) (8 diffs)

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;