Changeset 198 for Docking/CoolDocking/UCDManager.pas

Timestamp:

Mar 16, 2011, 12:32:41 PM (14 years ago)

Author:

george

Message:

• Fixed: Popup submenus style and position item selection.
• Added: Locking dock managers.
• Modified: Enhanced auto popup tabs handling. Not yet finished.
• Modified: Dock manager position united for all dock manager descendands.

File:

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

Docking/CoolDocking/UCDManager.pas

@@ -14 +14 @@
 
 type
-  THeaderPos = (hpAuto, hpLeft, hpTop, hpRight, hpBottom);
-
   TCDManager = class;
   TCDManagerItem = class;
@@ -23 +21 @@
   TCDHeaderButton = class
     Icon: TImage;
+    Visible: Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -32 +31 @@
   private
     procedure CloseButtonClick(Sender: TObject);
-    procedure DrawGrabber(Canvas: TCanvas; AControl: TControl);
     procedure PaintExecute(Sender: TObject);
     procedure RearrangeButtons;
@@ -40 +38 @@
     Icon: TImage;
     ManagerItem: TCDManagerItem;
+    procedure DrawGrabber(Canvas: TCanvas; AControl: TControl);
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -72 +71 @@
     procedure Paint(Sender: TObject); virtual;
     procedure VisibleChange(Sender: TObject); virtual;
-    constructor Create;
+    constructor Create; virtual;
     destructor Destroy; override;
   end;
@@ -81 +80 @@
   private
     FDockSite: TWinControl;
+    FHeaderPos: THeaderPos;
     function GetDockSite: TWinControl;
-    function GetHeaderPos: THeaderPos;
     function GetMoveDuration: Integer;
     procedure SetDockStyle(const AValue: TCDStyleType);
-    procedure SetHeaderPos(const AValue: THeaderPos);
     procedure SetMoveDuration(const AValue: Integer);
     procedure SetVisible(const AValue: Boolean);
   public
+    Locked: Boolean;
+    PopupMenu: TCDPopupMenu;
     FDockStyle: TCDStyleType;
-    PopupMenu: TCDPopupMenu;
     constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
@@ -100 +99 @@
       DropCtl: TControl); virtual;
     procedure DoSetVisible(const AValue: Boolean); virtual;
+    procedure SetHeaderPos(const AValue: THeaderPos); virtual;
+    function GetHeaderPos: THeaderPos; virtual;
 
     // Inherited from TDockManager
@@ -131 +132 @@
   end;
 
+function HeaderPosToTabPos(HeaderPos: THeaderPos): TTabPosition;
+
 
 implementation
@@ -137 +140 @@
   UCDManagerRegions, UCDManagerTabs, UCDManagerRegionsPopup, UCDManagerTabsPopup,
   UCDResource;
+
+function HeaderPosToTabPos(HeaderPos: THeaderPos): TTabPosition;
+begin
+  case HeaderPos of
+    hpBottom: Result := tpBottom;
+    hpLeft: Result := tpLeft;
+    hpTop: Result := tpTop;
+    hpRight: Result := tpRight;
+    hpAuto: Result := tpLeft;
+  end;
+end;
 
 { TCDHeaderButton }
@@ -204 +218 @@
 
 procedure TCDManagerItem.Paint(Sender: TObject);
-var
-  I: Integer;
-  R: TRect;
-begin
-(*  if not (csDesigning in ComponentState) then
-  if Assigned(Control) then begin
-    R := Control.ClientRect;
-    Canvas.FillRect(R);
-    Header.Visible := ShowHeader;
-    if ShowHeader then begin
-      if ClientAreaPanel.DockClientCount = 0 then
-        Header.DrawGrabber(Canvas, Control) else
-      Header.DrawGrabber(Canvas, ClientAreaPanel);
-    end;
-  end;*)
+begin
 end;
 
@@ -248 +248 @@
     //(Control as TWinControl).DockSite := False;
     //ClientAreaPanel.DockSite := False;
-    (Control as TWinControl).BeginDrag(False, 10);
-    DragManager.DragStart(Control, False, 1);
+    if not Manager.Locked then begin
+      (Control as TWinControl).BeginDrag(False, 10);
+      DragManager.DragStart(Control, False, 1);
+    end;
   end;
 end;
@@ -310 +312 @@
 function TCDManager.GetHeaderPos: THeaderPos;
 begin
-
+  Result := FHeaderPos;
 end;
 
@@ -527 +529 @@
     end else
     if AValue = dsPopupTabs then begin
-      NewManager := TCDStylePopupTabs.Create(FDockSite);
+      NewManager := TCDManagerTabsPopup.Create(FDockSite);
     end;
     if DockSite.DockManager is TCDManager then
@@ -538 +540 @@
 procedure TCDManager.SetHeaderPos(const AValue: THeaderPos);
 begin
-
+  FHeaderPos := AValue;
 end;
 
@@ -600 +602 @@
     Icon.Parent := Self;
     Icon.OnClick := CloseButtonClick;
+    Visible := True;
   end;
   Buttons.Add(NewButton);
@@ -606 +609 @@
     DataModule2.ImageList1.GetBitmap(1, Icon.Picture.Bitmap);
     Icon.Parent := Self;
-    Icon.OnClick := CloseButtonClick;
+    Icon.OnClick := nil;
+    Visible := False;
+  end;
+  Buttons.Add(NewButton);
+  NewButton := TCDHeaderButton.Create;
+  with NewButton do begin
+    DataModule2.ImageList1.GetBitmap(2, Icon.Picture.Bitmap);
+    Icon.Parent := Self;
+    Icon.OnClick := nil;
+    Visible := False;
   end;
   Buttons.Add(NewButton);
@@ -640 +652 @@
       else Title.Left := 6;
     Title.Caption := AControl.Caption;
+    RearrangeButtons;
   end;
 end;
@@ -702 +715 @@
   LeftPos := Self.Width;
   for I := 0 to Buttons.Count - 1 do
-  with TCDHeaderButton(Buttons[I]), Icon do begin
-    Anchors := [akRight, akTop];
+  with TCDHeaderButton(Buttons[I]) do
+  if Visible then begin
+    Icon.Anchors := [akRight, akTop];
     //Icon.Picture.Bitmap.SetSize(16, 16);
     Icon.Width := Icon.Picture.Bitmap.Width;
@@ -712 +726 @@
 
     //ShowMessage(IntToStr(Icon.Width) + ' ' +  InttoStr(Icon.Height));
-    Visible := True;
-  end;
+    Icon.Visible := True;
+  end else Icon.Visible := False;
 end;