Changeset 59 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Sep 24, 2010, 7:46:17 AM (14 years ago)

Author:

george

Message:

• Přidáno: Provázání odkazu na TCoolDockMaster přímo do TCoolDockManager.
• Opraveno: Nyní funkční odkaz kontextového menu Customize..., který zobrazí patřičné okno.

File:

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

Docking/CoolDocking/UCoolDocking.pas

@@ -23 +23 @@
   TCoolDockCustomize = class;
   TCoolDockClient = class;
+  TCoolDockMaster = class;
 
   { TCoolDockConjoinForm }
@@ -81 +82 @@
   TCoolDockManager = class(TDockManager)
   private
+    FMaster: TCoolDockMaster;
     FMoveDuration: Integer;
     FTabsPos: THeaderPos;
@@ -97 +99 @@
     procedure PopupMenuTabCloseClick(Sender: TObject);
     procedure SetDockStyle(const AValue: TDockStyle);
+    procedure SetMaster(const AValue: TCoolDockMaster);
     procedure SetMoveDuration(const AValue: Integer);
     procedure SetTabsPos(const AValue: THeaderPos);
@@ -144 +147 @@
     property MoveDuration: Integer read FMoveDuration write SetMoveDuration;
     property TabsPos: THeaderPos read FTabsPos write SetTabsPos;
+    property Master: TCoolDockMaster read FMaster write SetMaster;
   end;
 
@@ -181 +185 @@
   TCoolDockClient = class(TComponent)
   private
+    FDockable: Boolean;
     FMaster: TCoolDockMaster;
     FPanel: TPanel;
+    procedure SetDockable(const AValue: Boolean);
     procedure SetMaster(const AValue: TCoolDockMaster);
     constructor Create(AOwner: TComponent); override;
@@ -188 +194 @@
     procedure SetPanel(const AValue: TPanel);
   published
+    property Dockable: Boolean read FDockable
+      write SetDockable default True;
     property Master: TCoolDockMaster read FMaster
       write SetMaster;
@@ -538 +546 @@
     if (not Assigned(FDockSite.Parent)) then begin
       // Create conjointed form
-      NewConjoinDockForm := TCoolDockConjoinForm.Create(Application);
-      NewConjoinDockForm.Visible := True;
-      NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
+      NewConjoinDockForm := CreateContainer(InsertAt);
       FDockSite.ManualDock(NewConjoinDockForm.Panel);
       Control.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
     end else begin
-      NewConjoinDockForm := TCoolDockConjoinForm.Create(Application);
-      NewConjoinDockForm.Visible := True;
-      NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
-      NewConjoinDockForm.DragMode := dmAutomatic;
-      NewConjoinDockForm.DragKind := dkDock;
+      NewConjoinDockForm := CreateContainer(InsertAt);
       NewDockSite := FDockSite.HostDockSite;
 //      FDockSite.ManualFloat(FDockSite.BoundsRect);
@@ -664 +666 @@
   NewConjoinDockForm.Visible := True;
   NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
-  NewConjoinDockForm.DragMode := dmAutomatic;
-  NewConjoinDockForm.DragKind := dkDock;
+  NewConjoinDockForm.CoolDockClient.Master := Self.Master;
   NewDockSite := FDockSite.HostDockSite;
   //      FDockSite.ManualFloat(FDockSite.BoundsRect);
@@ -703 +704 @@
   end;
   UpdateClientSize;
+end;
+
+procedure TCoolDockManager.SetMaster(const AValue: TCoolDockMaster);
+begin
+  if FMaster = AValue then Exit;
+  FMaster := AValue;
 end;
 
@@ -849 +856 @@
 procedure TCoolDockManager.PopupMenuCustomizeClick(Sender: TObject);
 begin
-//  if Assigned(DockMaster.Customize) then
-//    DockMaster.Customize.Execute;
+  if Assigned(Master) and
+    Assigned(Master.Customize) then
+    Master.Customize.Execute;
 end;
 
@@ -1307 +1315 @@
   if Assigned(FOldMaster) then
     FOldMaster.UnregisterClient(Self);
-  if Assigned(FMaster) then
+  if Assigned(FMaster) then begin
     FMaster.RegisterClient(Self);
+    if not (csDesigning in ComponentState) then begin
+      if Assigned(TWinControl(Owner).DockManager) then
+        TCoolDockManager(TWinControl(Owner).DockManager).Master := FMaster;
+      if Assigned(Panel) then
+        TCoolDockManager(Panel.DockManager).Master := FMaster;
+    end;
+  end;
+end;
+
+procedure TCoolDockClient.SetDockable(const AValue: Boolean);
+begin
+  if FDockable = AValue then Exit;
+  FDockable := AValue;
+  if not (Owner is TForm) then
+  with (Owner as TForm) do
+  if AValue then begin
+    DragKind := dkDock;
+    DragMode := dmAutomatic;
+  end else begin
+    DragKind := dkDrag;
+    DragMode := dmManual;
+  end;
 end;
 
@@ -1314 +1344 @@
 begin
   inherited Create(AOwner);
+  FDockable := True;
   if not (AOwner is TForm) then
     raise Exception.Create(SWrongOwner);
   with (AOwner as TForm) do begin
     if not (csDesigning in ComponentState) then begin
-      DragKind := dkDock;
-      DragMode := dmAutomatic;
+      if Dockable then begin
+        DragKind := dkDock;
+        DragMode := dmAutomatic;
+      end;
       DockSite := True;
       UseDockManager := True;