Changeset 103 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Dec 29, 2010, 1:56:04 PM (14 years ago)

Author:

george

Message:

• Fixed: Hiding invisible docked forms as tabs.
• Added: Ability to bring window to front on execute Form.Show.

File:

• Docking/CoolDocking/UCoolDocking.pas (modified) (15 diffs)

Docking/CoolDocking/UCoolDocking.pas

@@ -32 +32 @@
     CoolDockClient: TCoolDockClient;
     procedure FormShow(Sender : TObject);
+    procedure FormHide(Sender : TObject);
     constructor Create(TheOwner: TComponent); override;
+    destructor Destroy; override;
+  private
+    procedure PanelVisibleChange(Sender: TObject);
   end;
 
   TDockStyle = (dsList, dsTabs, dsPopupTabs, dsPopupList);
+
+  // TObjectList<TCoolDockClientPanel>
+
+  { TCoolDockPanels }
+
+  TCoolDockPanels = class(TObjectList)
+    destructor Destroy; override;
+  end;
 
   { TCoolDockManager }
@@ -42 +54 @@
   private
     FMaster: TCoolDockMaster;
-    DockStyleHandler: TCoolDockStyle;
     FDockStyle: TDockStyle;
     FDockDirection: TDockDirection;
     FDockSite: TWinControl;
-    FDockPanels: TObjectList; // TObjectList<TCoolDockClientPanel>
-    function FindControlInPanels(Control: TControl): TCoolDockClientPanel;
+    FDockPanels: TCoolDockPanels;
     function GetDockSite: TWinControl;
+    function GetHeaderPos: THeaderPos;
     function GetMoveDuration: Integer;
     procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
       DropCtl: TControl);
     procedure SetDockStyle(const AValue: TDockStyle);
+    procedure SetHeaderPos(const AValue: THeaderPos);
     procedure SetMaster(const AValue: TCoolDockMaster);
     procedure SetMoveDuration(const AValue: Integer);
+    procedure SetVisible(const AValue: Boolean);
     procedure UpdateClientSize;
   public
+    DockStyleHandler: TCoolDockStyle;
     PopupMenu: TCoolDockPopupMenu;
     constructor Create(ADockSite: TWinControl); override;
@@ -82 +96 @@
     function AutoFreeByControl: Boolean; override;
 
+    function FindControlInPanels(Control: TControl): TCoolDockClientPanel;
     function CreateContainer(InsertAt: TAlign): TCoolDockConjoinForm;
-    property DockPanels: TObjectList read FDockPanels write FDockPanels;
+    property DockPanels: TCoolDockPanels read FDockPanels write FDockPanels;
     property DockStyle: TDockStyle read FDockStyle write SetDockStyle;
     property MoveDuration: Integer read GetMoveDuration write SetMoveDuration;
     property Master: TCoolDockMaster read FMaster write SetMaster;
     property DockSite: TWinControl read GetDockSite;
+    property HeaderPos: THeaderPos read GetHeaderPos write SetHeaderPos;
+    property Visible: Boolean write SetVisible;
   end;
 
@@ -194 +211 @@
 end;
 
+{ TCoolDockPanels }
+
+destructor TCoolDockPanels.Destroy;
+var
+  Temp: Integer;
+begin
+  Temp := Count;
+  inherited Destroy;
+end;
+
 
 { TCoolDockManager }
@@ -214 +241 @@
 end;
 
+function TCoolDockManager.GetHeaderPos: THeaderPos;
+begin
+
+end;
+
 function TCoolDockManager.GetMoveDuration: Integer;
 begin
@@ -226 +258 @@
   inherited Create(ADockSite);
   FDockSite := ADockSite;
-  FDockPanels := TObjectList.Create;
+  FDockPanels := TCoolDockPanels.Create;
 
   FDockStyle := dsTabs; // To initialize style value have to be different
   DockStyle := dsList;
   PopupMenu := TCoolDockPopupMenu.Create(Self);
+  PopupMenu.Parent := ADockSite;
 end;
 
@@ -236 +269 @@
 begin
   PopupMenu.Free;
+  DockStyleHandler.Free;
   FDockPanels.Free;
-  DockStyleHandler.Free;
   inherited Destroy;
 end;
@@ -309 +342 @@
       if DockStyle = dsList then Visible := True;
       Align := alClient;
-      Header.PopupMenu := PopupMenu;
+      Header.PopupMenu := Self.PopupMenu;
+      //PopupMenu.Parent := Self.DockSite;
     end;
     if (Control is TForm) and Assigned((Control as TForm).Icon) then
@@ -417 +451 @@
   if Control.HostDockSite = Self.FDockSite then begin
     ClientPanel := FindControlInPanels(Control);
+
     //if Assigned(ClientPanel) then ClientPanel.Splitter.Free;
+    //Control.RemoveHandlerOnVisibleChanged(ClientPanel.VisibleChange);
     FDockPanels.Remove(ClientPanel);
     if FDockSite.DockClientCount = 2 then FDockDirection := ddNone;
@@ -474 +510 @@
     if AValue = dsTabs then begin
       DockStyleHandler := TCoolDockStyleTabs.Create(Self);
+      TCoolDockStyleTabs(DockStyleHandler).TabControlChange(Self);
     end else
     if AValue = dsList then begin
@@ -488 +525 @@
 end;
 
+procedure TCoolDockManager.SetHeaderPos(const AValue: THeaderPos);
+begin
+
+end;
+
 procedure TCoolDockManager.SetMaster(const AValue: TCoolDockMaster);
 begin
@@ -498 +540 @@
 end;
 
+procedure TCoolDockManager.SetVisible(const AValue: Boolean);
+var
+  I: Integer;
+begin
+//  for I := 0 to DockPanels.Count - 1 do
+//    TCoolDockClientPanel(DockPanels[I]).Visible := AValue;
+end;
+
 procedure TCoolDockManager.UpdateClientSize;
 begin
@@ -507 +557 @@
 procedure TCoolDockConjoinForm.FormShow(Sender: TObject);
 begin
-  //Panel.Show;
+  Panel.Show;
+  TCoolDockManager(Panel.DockManager).Visible := True;
+end;
+
+procedure TCoolDockConjoinForm.FormHide(Sender: TObject);
+var
+  I: Integer;
+begin
+  Panel.Hide;
+  TCoolDockManager(Panel.DockManager).Visible := False;
+  // Hide all docked childs
+  with TCoolDockManager(Panel.DockManager) do
+  for I := 0 to DockPanels.Count - 1 do
+    if Assigned(TCoolDockClientPanel(DockPanels[I]).Control) then
+    TCoolDockClientPanel(DockPanels[I]).Control.Hide;
 end;
 
@@ -517 +581 @@
     Parent := Self;
     Name := Parent.Name + '_Panel';
+    Caption := '';
     DockSite := True;
     UseDockManager := True;
@@ -530 +595 @@
   end;
   OnShow := FormShow;
+  OnHide := FormHide;
+
+  Panel.AddHandlerOnVisibleChanged(PanelVisibleChange);
+end;
+
+destructor TCoolDockConjoinForm.Destroy;
+begin
+  Panel.RemoveHandlerOnVisibleChanged(PanelVisibleChange);
+  inherited;
+end;
+
+procedure TCoolDockConjoinForm.PanelVisibleChange(Sender: TObject);
+begin
+  Visible := Panel.Visible;
 end;