Changeset 355 for Docking/CoolDocking/Managers

Timestamp:

Apr 27, 2012, 8:34:10 AM (13 years ago)

Author:

chronos

Message:

• Modified: Change concept of dock manager items logical visibility vs TControl real visibility. Not visible controls are hidden by manager using TCDManager.DockSiteVisible property. TCDManager provide events OnDockSiteHide and OnDockSiteShow for handling logical visibility.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (2 diffs)
• UCDManagerTabs.pas (modified) (3 diffs)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -307 +307 @@
   VisibleControlsCount: Integer;
 begin
+  inherited;
   if FUpdateCount = 0 then begin
   DebugLog('TCDManagerRegions.UpdateClientSize');
-  inherited;
   VisibleControlsCount := DockSite.VisibleDockClientCount;
-  if DockSite is TForm then
-    DockSite.Visible := (VisibleControlsCount > 0);
+  if DockSite is TForm then begin
+    DockSiteVisible := VisibleControlsCount > 0;
+  end;
   if VisibleControlsCount = 0 then VisibleControlsCount := 1;
 
@@ -360 +361 @@
 begin
   inherited;
+  //if DockSite.Visible <> AValue then
   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
-          Control.Show;
-          Control.Tag := Integer(dhtPermanent);
-        end else
-        if not AValue then begin
-          Control.Tag := Integer(dhtTemporal);
-          Control.Hide;
-        end;
+        TCDManager(Control.DockManager).DockSiteVisible := AValue;
       end;
         //ClientAreaPanel.Show;

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -87 +87 @@
       Update;
       Switch(DockItems.IndexOf(FindControlInPanels(TControl(Sender))));
-      TCDManagerTabsItem(DockItems[DockItems.IndexOf(
-        FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
+      //TCDManagerTabsItem(DockItems[DockItems.IndexOf(
+      //  FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
     end else Update;
   end;
@@ -124 +124 @@
   inherited;
   if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockItems.Count) then
-    with TCDManagerItem(DockItems[PageControl.TabIndex]) do begin
-      if AValue and (not Control.Visible) and (Control.Tag = Integer(dhtTemporal)) then begin
-        Control.Show;
-        Control.Tag := Integer(dhtPermanent);
-      end;
-    end;
+    with TCDManagerItem(DockItems[PageControl.TabIndex]) do
+      TCDManager(Control.DockManager).DockSiteVisible := True;
 end;
 
@@ -399 +395 @@
     Control.Align := alClient;
     if PageControl.PageIndex = I then begin
-      if (not Control.Visible) and (HideType = dhtTemporal) then
-        Control.Visible := True;
+      TCDManager(Control.DockManager).DockSiteVisible := True;
+      if not Control.Visible then Control.Show;
     end else begin
-      if Control.Visible then begin
-        HideType := dhtTemporal;
-        Control.Visible := False;
-      end;
-    end;
-    PageControl.Pages[I].TabVisible := Control.Visible or (HideType = dhtTemporal);
+      TCDManager(Control.DockManager).DockSiteVisible := False;
+    end;
+    PageControl.Pages[I].TabVisible := Control.Visible;
 
     //TCDClientPanel(DockPanels[I]).ClientAreaPanel.Width := DockSite.Width;