Changeset 186 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Mar 10, 2011, 1:32:41 PM (14 years ago)

Author:

george

Message:

• Modified: Removed TPanel component from TCoolDockConjoinForm to simplify component structure.

File:

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

Docking/CoolDocking/UCoolDocking.pas

@@ -27 +27 @@
   TCoolDockConjoinForm = class(TCoolDockConjoinFormBase)
   public
-    Panel: TPanel;
     CoolDockClient: TCoolDockClient;
     procedure FormShow(Sender : TObject);
@@ -35 +34 @@
   private
     procedure SetName(const NewName: TComponentName); override;
-    procedure PanelVisibleChange(Sender: TObject);
   end;
 
@@ -287 +285 @@
   NewForm: TForm;
 begin
-  if (FDockSite is TForm) then begin
+  if (FDockSite is TForm) and (not (FDockSite is TCoolDockConjoinForm)) then begin
     if (not Assigned(FDockSite.Parent)) then begin
       // Create conjointed form
       NewConjoinDockForm := CreateContainer(InsertAt);
-      FDockSite.ManualDock(NewConjoinDockForm.Panel);
-      Control.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
+      FDockSite.ManualDock(NewConjoinDockForm);
+      Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
     end else begin
       NewConjoinDockForm := CreateContainer(InsertAt);
@@ -298 +296 @@
 //      FDockSite.ManualFloat(FDockSite.BoundsRect);
       NewConjoinDockForm.ManualDock(NewDockSite, nil, InsertAt);
-      FDockSite.ManualDock(NewConjoinDockForm.Panel);
-      Control.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
+      FDockSite.ManualDock(NewConjoinDockForm);
+      Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
     end;
   end else
-  if (FDockSite is TPanel) or (FDockSite is TCoolDockClientPanel) then begin
+  if (FDockSite is TCoolDockConjoinForm) or (FDockSite is TPanel) or (FDockSite is TCoolDockClientPanel) then begin
     InsertControlPanel(Control, InsertAt, DropCtl);
   end;
@@ -479 +477 @@
 procedure TCoolDockConjoinForm.FormShow(Sender: TObject);
 begin
-  Panel.Show;
-  TCoolDockManager(Panel.DockManager).Visible := True;
+  TCoolDockManager(DockManager).Visible := True;
 end;
 
@@ -487 +484 @@
   I: Integer;
 begin
-  Panel.Hide;
-  TCoolDockManager(Panel.DockManager).Visible := False;
+  TCoolDockManager(DockManager).Visible := False;
   // Hide all docked childs
-  with TCoolDockManager(Panel.DockManager) do
+  with TCoolDockManager(DockManager) do
   for I := 0 to DockPanels.Count - 1 do
     if Assigned(TCoolDockClientPanel(DockPanels[I]).Control) then begin
@@ -501 +497 @@
 begin
   inherited CreateNew(TheOwner);
-  Panel := TPanel.Create(Self);
-  with Panel do begin
-    Parent := Self;
-    Caption := '';
-    DockSite := True;
-    UseDockManager := True;
-    Align := alClient;
-    BevelOuter := bvNone;
-    BevelInner := bvNone;
-  //  Color := clYellow;
-  end;
   CoolDockClient := TCoolDockClient.Create(Self);
   with CoolDockClient do begin
-    Panel := Self.Panel;
   end;
   OnShow := FormShow;
   OnHide := FormHide;
-
-  Panel.AddHandlerOnVisibleChanged(PanelVisibleChange);
 end;
 
 destructor TCoolDockConjoinForm.Destroy;
 begin
-  Panel.RemoveHandlerOnVisibleChanged(PanelVisibleChange);
   inherited;
 end;
@@ -531 +512 @@
 begin
   inherited SetName(NewName);
-  Panel.Name := Name + 'Panel';
-  Panel.Caption := '';
   CoolDockClient.Name := Name + 'CoolDockClient';
-end;
-
-procedure TCoolDockConjoinForm.PanelVisibleChange(Sender: TObject);
-begin
-  Visible := Panel.Visible;
 end;