Changeset 57 for Docking/CoolDocking/UCoolDocking.pas

Timestamp:

Sep 22, 2010, 9:21:42 AM (14 years ago)

Author:

george

Message:

• Přidáno: Zobrazení ikon v titulku ukotvených oken.
• Opraveno: Vzájemné provázání TCoolDockCustomize a TCoolDockMaster.
• Upraveno: Vytváření seznamu ukotvitelných oken komponenty TCoolDockWindowList.

File:

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

Docking/CoolDocking/UCoolDocking.pas

@@ -37 +37 @@
     CloseButton: TSpeedButton;
     Title: TLabel;
-    Icon: TIcon;
+    Icon: TImage;
     ParentClientPanel: TCoolDockClientPanel;
     Shape: TShape;
@@ -157 +157 @@
     procedure SaveLayoutToFile(FileName: string);
     procedure LoadLayoutFromFile(FileName: string);
+    destructor Destroy; override;
   published
     property TabsEnabled: Boolean read FTabsEnabled write SetTabsEnabled;
@@ -169 +170 @@
   TCoolDockCustomize = class(TComponent)
   private
-    FManager: TCoolDockMaster;
-    procedure SetManager(const AValue: TCoolDockMaster);
+    FMaster: TCoolDockMaster;
+    Form: TCoolDockCustomizeForm;
+    procedure SetMaster(const AValue: TCoolDockMaster);
   public
-    Form: TCoolDockCustomizeForm;
     function Execute: Boolean;
     constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
   published
-    property Manager: TCoolDockMaster read FManager write SetManager;
+    property Master: TCoolDockMaster read FMaster write SetMaster;
   end;
 
@@ -183 +185 @@
   TCoolDockWindowList = class(TComponent)
   private
+    Form: TCoolDockWindowListForm;
   public
-    Form: TCoolDockWindowListForm;
     function Execute: Boolean;
     constructor Create(AOwner: TComponent); override;
@@ -469 +471 @@
       Header.PopupMenu := PopupMenuHeader;
     end;
+    if (Control is TForm) and Assigned((Control as TForm).Icon) then
+      NewPanel.Header.Icon.Picture.Assign((Control as TForm).Icon);
 
     if DockStyle = dsTabs then begin
@@ -708 +712 @@
     for I := 0 to FDockPanels.Count - 1 do begin
       TCoolDockClientPanel(FDockPanels[I]).Height := FDockSite.Height div
-        FDockSite.VisibleDockClientCount;
+        FDockSite.DockClientCount;
       TCoolDockClientPanel(FDockPanels[I]).Width := FDockSite.Width div
-        FDockSite.VisibleDockClientCount;
+        FDockSite.DockClientCount;
       //TCoolDockClientPanel(FDockPanels[I]).DockPanelPaint(Self);
+      TCoolDockClientPanel(FDockPanels[I]).DockPanelPaint(Self);
     end;
   end else
@@ -841 +846 @@
 procedure TCoolDockClientPanel.VisibleChange(Sender: TObject);
 begin
-  //OwnerDockManager.FDockPanels.Remove(Self);
-  ClientAreaPanel.Visible := Control.Visible;
-  Splitter.Visible := Control.Visible;
-  OwnerDockManager.UpdateClientSize;
+(*  if Assigned(Control) then begin
+    //OwnerDockManager.FDockPanels.Remove(Self);
+    if Assigned(ClientAreaPanel) then
+      ClientAreaPanel.Visible := Control.Visible;
+    if Assigned(Splitter) then
+      Splitter.Visible := Control.Visible;
+    OwnerDockManager.UpdateClientSize;
+  end;*)
 end;
 
@@ -968 +977 @@
 procedure TCoolDockMaster.SetCustomize(const AValue: TCoolDockCustomize
   );
-begin
-  if FCoolDockCustomize=AValue then exit;
-  FCoolDockCustomize:=AValue;
-  if Assigned(AValue) then
-    if not Assigned(AValue.Manager) then
-      AValue.Manager := Self;
+var
+  OldCustomize: TCoolDockCustomize;
+begin
+  if FCoolDockCustomize = AValue then Exit;
+  OldCustomize := FCoolDockCustomize;
+  FCoolDockCustomize := AValue;
+  if Assigned(AValue) then begin
+    FCoolDockCustomize.Master := Self;
+  end else begin
+    OldCustomize.Master := nil;
+  end;
 end;
 
@@ -1077 +1091 @@
     Free;
   end;
+end;
+
+destructor TCoolDockMaster.Destroy;
+begin
+  Customize := nil;
+  inherited Destroy;
 end;
 
@@ -1116 +1136 @@
     BevelOuter := bvNone;
   end;
+  Icon := TImage.Create(Self);
+  with Icon do begin
+    Parent := Self;
+    Left := 4;
+    Top := 3;
+    Visible := True;
+  end;
 end;
 
@@ -1134 +1161 @@
       else Title.Font.Style := Font.Style - [fsBold];
     Rectangle(1, 1, AControl.Width - 1, GrabberSize - 1);
+    if Icon.Picture.Width > 0 then Title.Left := 8 + Icon.Picture.Width
+      else Title.Left := 6;
     Title.Caption := AControl.Caption;
   end;
@@ -1145 +1174 @@
 { TCoolDockCustomize }
 
-procedure TCoolDockCustomize.SetManager(const AValue: TCoolDockMaster);
-begin
-  if FManager = AValue then exit;
-  FManager := AValue;
-  if Assigned(AValue) then
-    if not Assigned(AValue.Customize) then
-      AValue.Customize := Self;
+procedure TCoolDockCustomize.SetMaster(const AValue: TCoolDockMaster);
+var
+  OldMaster: TCoolDockMaster;
+begin
+  if FMaster = AValue then Exit;
+  OldMaster := FMaster;
+  FMaster := AValue;
+  if Assigned(AValue) then begin
+    FMaster.Customize := Self;
+  end else begin
+    OldMaster.Customize := nil;
+  end;
 end;
 
 function TCoolDockCustomize.Execute: Boolean;
 begin
+  Form := TCoolDockCustomizeForm.Create(Self);
   Form.ShowModal;
+  Form.Free;
   Result := True;
 end;
@@ -1163 +1199 @@
 begin
   inherited Create(AOwner);
-  Form := TCoolDockCustomizeForm.Create(Self);
+end;
+
+destructor TCoolDockCustomize.Destroy;
+begin
+  Master := nil;
+  inherited Destroy;
 end;
 
@@ -1171 +1212 @@
 function TCoolDockWindowList.Execute: Boolean;
 begin
+  Form := TCoolDockWindowListForm.Create(Self);
   Form.ShowModal;
+  Form.Free;
   Result := True;
 end;
@@ -1178 +1221 @@
 begin
   inherited Create(AOwner);
-  Form := TCoolDockWindowListForm.Create(Self);
 end;