Changeset 354 for Docking/CoolDocking/Managers

Timestamp:

Apr 26, 2012, 9:12:02 AM (13 years ago)

Author:

chronos

Message:

• Added: CoolDocking text logging support.
• Added: CoolDocking update locking on TCDManager descendants update. This fixes tab disappear if tab with regions style conjoinform was switched to another tab.
• Modified: CoolDocking regions style item layout changed to support aligned forms. Only one region is aligned as alClient. Rest contained regions are aligned to borders.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (14 diffs)
• UCDManagerTabs.pas (modified) (11 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -17 +17 @@
     PanelHeader: TCDPanelHeader;
     Splitter: TSplitter;
+    Align: TAlign;
     procedure VisibleChange(Sender: TObject); override;
     procedure Paint(Sender: TObject); override;
@@ -43 +44 @@
     destructor Destroy; override;
     procedure PaintSite(DC: HDC); override;
-    procedure UpdateClientSize; override;
+    procedure Update; override;
     procedure SetVisible(const AValue: Boolean); override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
@@ -65 +66 @@
     //  TCDManagerRegionsItem(DockItems[DockItems.IndexOf(FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
     //end;
-    UpdateClientSize;
+    Update;
+
+    // if any region is visible, show parent docksite
+    //if DockSite is TForm then
+    //  DockSite.Visible := (DockSite.VisibleDockClientCount > 0);
   end;
 end;
@@ -130 +135 @@
   inherited SetHeaderPos(AValue);
   if Assigned(DockSite.Parent) then
-    TCDManager(DockSite.Parent.DockManager).UpdateClientSize;
+    TCDManager(DockSite.Parent.DockManager).Update;
 (*  case AValue of
     hpBottom, hpTop: FDockDirection := ddVertical;
@@ -179 +184 @@
 
   NewItem.PanelHeader.Parent := DockSite;
+
+  if DockItems.Count = 0 then NewItem.Align := alClient
+    else NewItem.Align := InsertAt;
 
   NewItem.Control := TWinControl(Control);
@@ -219 +227 @@
         Control.ManualDock(DockSite, nil, InsertAt);
         NewConjoinDockForm.UpdateCaption;
-        UpdateClientSize;
+        Update;
         Exit;
       end;
@@ -225 +233 @@
     InsertControlNoUpdate(Control, InsertAt);
   end;
-  UpdateClientSize;
+  Update;
 end;
 
@@ -257 +265 @@
   end;
   inherited RemoveControl(Control);
-  if ClientCount > 1 then UpdateClientSize;
+  if ClientCount > 1 then Update;
 end;
 
@@ -271 +279 @@
   for I := 0 to ADockSite.DockClientCount - 1 do
     InsertControlNoUpdate(ADockSite.DockClients[I], alLeft);
-  UpdateClientSize;
+  Update;
 end;
 
@@ -291 +299 @@
 end;
 
-procedure TCDManagerRegions.UpdateClientSize;
+procedure TCDManagerRegions.Update;
 var
   I: Integer;
@@ -299 +307 @@
   VisibleControlsCount: Integer;
 begin
-  inherited UpdateClientSize;
-  if FDockDirection = ddHorizontal then
-    BaseAlign := alLeft else BaseAlign := alTop;
-
-  SplitterLeft := 0;
-  SplitterTop := 0;
+  if FUpdateCount = 0 then begin
+  DebugLog('TCDManagerRegions.UpdateClientSize');
+  inherited;
   VisibleControlsCount := DockSite.VisibleDockClientCount;
   if DockSite is TForm then
-    DockSite.Visible := VisibleControlsCount > 0;
+    DockSite.Visible := (VisibleControlsCount > 0);
   if VisibleControlsCount = 0 then VisibleControlsCount := 1;
 
@@ -323 +328 @@
     PanelHeader.Visible := Control.Visible;
     Paint(Self);
-    if I < (DockItems.Count - 1) then PanelHeader.Align := BaseAlign
-      else PanelHeader.Align := alClient;
-
-    Inc(SplitterLeft, PanelHeader.Width);
-    Inc(SplitterTop, PanelHeader.Height);
+    if FDockDirection = ddHorizontal then
+      BaseAlign := alLeft else BaseAlign := alTop;
+
+    if I < Trunc((DockItems.Count - 1) / 2) then BaseAlign := BaseAlign
+        else if I = Trunc((DockItems.Count - 1) / 2) then BaseAlign := alClient
+        else if I > Trunc((DockItems.Count - 1) / 2) then begin
+          if BaseAlign = alTop then BaseAlign := alBottom
+          else if BaseAlign = alLeft then BaseAlign := alRight;
+        end;
+    PanelHeader.Align := BaseAlign;
+
+    Splitter.Align := BaseAlign;
+    SplitterLeft := PanelHeader.Left;
+    SplitterTop := PanelHeader.Top;
     Splitter.Left := SplitterLeft;
     Splitter.Top := SplitterTop;
     Splitter.Parent := Self.DockSite;
-    Splitter.Align := BaseAlign;
-    Splitter.Visible := I < (DockItems.Count - 1);
+    Splitter.Visible := I <> (Trunc(DockItems.Count - 1) / 2);
     Inc(SplitterLeft, Splitter.Width);
     Inc(SplitterTop, Splitter.Height);
 
     Paint(Self);
-    if I < (DockItems.Count - 1) then begin
-      if DockDirection = ddHorizontal then PanelHeader.Align := alLeft
-        else PanelHeader.Align := alTop;
-    end else PanelHeader.Align := alClient;
+    PanelHeader.Align := BaseAlign;
+  end;
   end;
 end;
@@ -349 +360 @@
 begin
   inherited;
-  for I := 0 to DockItems.Count - 1 do
+  try
+    BeginUpdate;
+    for I := 0 to DockItems.Count - 1 do
       with TCDManagerRegionsItem(DockItems[I]) do begin
         if AValue and (not Control.Visible) and (Control.Tag = Integer(dhtTemporal))  then begin
@@ -361 +374 @@
       end;
         //ClientAreaPanel.Show;
+  finally
+    EndUpdate;
+  end;
 end;
 

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -44 +44 @@
     TabImageList: TImageList;
     PageControl: TPageControl;
-    procedure UpdateClientSize; override;
+    procedure Update; override;
     procedure SetHeaderPos(const AValue: THeaderPos); override;
     procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); virtual;
@@ -82 +82 @@
   Temp2: TControl;
 begin
+  DebugLog('TCDManagerTabsItem.VisibleChange');
   with TCDManagerTabs(Manager) do begin
     if TControl(Sender).Visible then begin
-      UpdateClientSize;
+      Update;
       Switch(DockItems.IndexOf(FindControlInPanels(TControl(Sender))));
       TCDManagerTabsItem(DockItems[DockItems.IndexOf(
         FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
-    end else UpdateClientSize;
+    end else Update;
   end;
 
@@ -143 +144 @@
 procedure TCDManagerTabs.TabControlChange(Sender: TObject);
 begin
-  UpdateClientSize;
+  DebugLog('TCDManagerTabs.TabControlChange ' + IntToStr(PageControl.TabIndex));
+  Update;
   MouseDownSkip := True;
 end;
@@ -189 +191 @@
     OnChange := TabControlChange;
     MultiLine := True;
+    AutoSize := True;
     PopupMenu := Self.PopupMenu;
     OnMouseLeave := TabControlMouseLeave;
@@ -225 +228 @@
 procedure TCDManagerTabs.Switch(Index: Integer);
 begin
+  DebugLog('TCDManagerTabs.Switch ' + IntToStr(Index));
   PageControl.TabIndex := Index;
 end;
@@ -265 +269 @@
   end; //else raise Exception.Create(Format('Control %s not found in DockItems', [Control.Name]));
 
-  ManagerItem.Control.Visible := False;
+  //ManagerItem.Control.Visible := False;
   ManagerItem.Control.Parent := nil;
   DockItems.Remove(ManagerItem);
@@ -279 +283 @@
       end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
       ManualFloat(Rect(Left, Top, Left + Width, Top + Height));
-      //UpdateClientSize;
+      //Update;
       inherited RemoveControl(Control);
       Free;
@@ -286 +290 @@
   end;
   //if ClientCount > 0 then
-  UpdateClientSize;
+  Update;
   inherited RemoveControl(Control);
 end;
@@ -341 +345 @@
   inherited;
   InsertControlNoUpdate(AControl, InsertAt);
-  UpdateClientSize;
-end;
-
-procedure TCDManagerTabs.UpdateClientSize;
+  Update;
+end;
+
+procedure TCDManagerTabs.Update;
 var
   I: Integer;
@@ -350 +354 @@
   DeletedPage: TTabSheet;
 begin
+  if FUpdateCount = 0 then begin
+  DebugLog('TCDManagerTabs.Update');
   for I := 0 to DockItems.Count - 1 do
   with TCDManagerTabsItem(DockItems[I]) do begin
@@ -407 +413 @@
     //TCDClientPanel(FDockPanels[I]).DockPanelPaint(Self);
   end;
-  inherited UpdateClientSize;
+  end;
+  inherited;
 end;