Changeset 61 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Sep 29, 2010, 9:14:55 AM (14 years ago)

Author:

george

Message:

• Opraveno: Obsluha událostí OnShow a OnHide.
• Opraveno: Zamezení ukotvení okna do sebe.

File:

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

Docking/CoolDocking/UCoolDocking.pas

@@ -10 +10 @@
   Classes, SysUtils, Controls, LCLType, LMessages, Graphics, StdCtrls,
   Buttons, ExtCtrls, Contnrs, Forms, ComCtrls, Dialogs, Menus, FileUtil,
-  UCoolDockCustomize, DOM, XMLWrite, XMLRead, UCoolDockWindowList;
+  UCoolDockCustomize, DOM, XMLWrite, XMLRead, UCoolDockWindowList,
+  DateUtils;
 
 const
@@ -38 +39 @@
 
   TCoolDockHeader = class(TPanel)
+  private
+    procedure CloseButtonClick(Sender: TObject);
+    procedure DrawGrabber(Canvas: TCanvas; AControl: TControl);
+  public
     CloseButton: TSpeedButton;
     Title: TLabel;
@@ -45 +50 @@
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
-  private
-    procedure CloseButtonClick(Sender: TObject);
-    procedure DrawGrabber(Canvas: TCanvas; AControl: TControl);
   end;
 
@@ -158 +160 @@
     FCoolDockCustomize: TCoolDockCustomize;
     FDefaultHeaderPos: THeaderPos;
+    FDefaultTabsPos: THeaderPos;
     FShowIcons: Boolean;
     FTabsEnabled: Boolean;
@@ -177 +180 @@
   published
     property TabsEnabled: Boolean read FTabsEnabled write SetTabsEnabled;
+    property DefaultTabsPos: THeaderPos read FDefaultTabsPos
+      write FDefaultTabsPos;
     property DefaultHeaderPos: THeaderPos read FDefaultHeaderPos
       write FDefaultHeaderPos;
@@ -194 +199 @@
     procedure SetFloatable(const AValue: Boolean);
     procedure SetMaster(const AValue: TCoolDockMaster);
+    procedure SetPanel(const AValue: TPanel);
+  public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-    procedure SetPanel(const AValue: TPanel);
   published
     property Dockable: Boolean read FDockable
@@ -716 +722 @@
       TCoolDockClientPanel(FDockPanels[I]).ClientAreaPanel.Parent := TCoolDockClientPanel(FDockPanels[I]);
       TCoolDockClientPanel(FDockPanels[I]).ClientAreaPanel.Visible := True;
+      TCoolDockClientPanel(FDockPanels[I]).Control.Visible := True;
     end;
   end;
@@ -725 +732 @@
   if FMaster = AValue then Exit;
   FMaster := AValue;
+  TabsPos := AValue.DefaultTabsPos;
 end;
 
@@ -792 +800 @@
   for I := 0 to FDockPanels.Count - 1 do begin
     TCoolDockClientPanel(FDockPanels[I]).ClientAreaPanel.Visible := False;
+    TCoolDockClientPanel(FDockPanels[I]).Control.Visible := False;
   end;
   if (TabControl.TabIndex <> -1) and (FDockPanels.Count > TabControl.TabIndex) then begin
     with TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]), ClientAreaPanel do begin
+      Control.Show;
       if AutoHide then begin
         Parent := nil;
@@ -892 +902 @@
 begin
   if (Button = mbLeft) and (TabControl.TabIndex <> -1) then begin
+    TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).ClientAreaPanel.DockSite := False;
     DragManager.DragStart(TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).Control, False, 1);
   end;
@@ -911 +922 @@
 
 procedure TCoolDockClientPanel.VisibleChange(Sender: TObject);
-begin
-  if Assigned(Control) then begin
+var
+  Visible: Boolean;
+begin
+  (*if Assigned(Control) then begin
+    Visible := Control.Visible;
     if Assigned(ClientAreaPanel) then
-      ClientAreaPanel.Visible := Control.Visible;
+      ClientAreaPanel.Visible := Visible;
     if Assigned(Splitter) then
-      Splitter.Visible := Control.Visible;
+      Splitter.Visible := Visible;
     OwnerDockManager.UpdateClientSize;
-  end;
+  end;*)
 end;
 
@@ -936 +950 @@
 begin
   inherited;
+  ShowHeader := True;
   Header := TCoolDockHeader.Create(Self);
   with Header do begin
@@ -964 +979 @@
   BevelInner := bvNone;
   BevelOuter := bvNone;
-  ShowHeader := True;
   AutoHide := False;
   HeaderPos := hpTop;
@@ -989 +1003 @@
   R: TRect;
 begin
+  if (csDestroyingHandle in ControlState) then
   if Assigned(Control) then begin
     R := Control.ClientRect;
@@ -1009 +1024 @@
   end;
   if (Button = mbLeft) then begin
-    DragManager.DragStart(Control, False, 1);
+    //(Control as TWinControl).DockSite := False;
+    ClientAreaPanel.DockSite := False;
+    (Control as TWinControl).BeginDrag(True);
+    //DragManager.DragStart(Control, False, 1);
   end;
 end;
@@ -1179 +1197 @@
 
 destructor TCoolDockMaster.Destroy;
-begin
+var
+  I: Integer;
+begin
+  // Assigning nil to Client Master property cause unregistring client from list
+  for I := FClients.Count - 1 downto 0 do
+    TCoolDockClient(FClients[I]).Master := nil;
   FClients.Free;
   Customize := nil;
@@ -1188 +1211 @@
 begin
   if Assigned(Client) then
-    if FClients.IndexOf(Client) <> -1 then begin
+    if FClients.IndexOf(Client) = -1 then begin
       FClients.Add(Client);
       Client.Master := Self;
@@ -1357 +1380 @@
     DragKind := dkDock;
     DragMode := dmAutomatic;
+    DockSite := True;
   end else begin
     DragKind := dkDrag;
     DragMode := dmManual;
+    DockSite := False;
   end;
 end;
@@ -1380 +1405 @@
         DragKind := dkDock;
         DragMode := dmAutomatic;
+        DockSite := True;
       end;
-      DockSite := True;
       UseDockManager := True;
       DockManager := TCoolDockManager.Create(TWinControl(AOwner));