Changeset 218 for Docking/CoolDocking/Managers

Timestamp:

Mar 23, 2011, 12:22:26 PM (14 years ago)

Author:

george

Message:

• Fixed: Parent manager tabs switching.

Location:

Docking/CoolDocking/Managers

Files:

• UCDManagerRegions.pas (modified) (9 diffs)
• UCDManagerTabs.pas (modified) (6 diffs)
• UCDManagerTabsPopup.pas (modified) (1 diff)

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -21 +21 @@
     constructor Create;
     destructor Destroy; override;
+    procedure SetControl(const AValue: TWinControl); override;
   end;
 
@@ -43 +44 @@
     procedure PaintSite(DC: HDC); override;
     procedure UpdateClientSize; override;
-    procedure DoSetVisible(const AValue: Boolean); override;
+    procedure SetVisible(const AValue: Boolean); override;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
     property DockDirection: TCDDirection read FDockDirection
@@ -88 +89 @@
 begin
   PanelHeader := TCDPanelHeader.Create(nil);
-  PanelHeader.Header.ManagerItem := Self;
+//  PanelHeader.Header.ManagerItem := Self;
   PanelHeader.Header.OnMouseDown := DockPanelMouseDown;
   PanelHeader.Header.Icon.OnMouseDown := DockPanelMouseDown;
@@ -109 +110 @@
   Control.Parent := nil;
   inherited Destroy;
+end;
+
+procedure TCDManagerRegionsItem.SetControl(const AValue: TWinControl);
+begin
+  inherited SetControl(AValue);
+  PanelHeader.Header.Control := AValue;
 end;
 
@@ -175 +182 @@
   NewItem.Control := TWinControl(Control);
   Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
+  Control.AddHandlerOnVisibleChanging(NewItem.VisibleChanging);
   Control.Parent := NewItem.PanelHeader.ControlPanel;
   Control.Align := alClient;
@@ -199 +207 @@
       if (NewDirection <> FDockDirection) then begin
         // Direction change, create conjoin form
-        NewConjoinDockForm := CreateContainer(InsertAt);
+        NewConjoinDockForm := CreateConjoinForm;
         try
           FreeParentIfEmpty := False;
@@ -228 +236 @@
   if Assigned(ManagerItem) then begin
     Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
+    Control.RemoveHandlerOnVisibleChanging(ManagerItem.VisibleChanging);
   end;
 
@@ -335 +344 @@
 end;
 
-procedure TCDManagerRegions.DoSetVisible(const AValue: Boolean);
+procedure TCDManagerRegions.SetVisible(const AValue: Boolean);
 var
   I: Integer;
@@ -341 +350 @@
   inherited;
   for I := 0 to DockItems.Count - 1 do
-
-        //Show;
-        //ShowMessage(IntToStr(Control.Tag));
       with TCDManagerRegionsItem(DockItems[I]) do begin
         if AValue and (not Control.Visible) and (Control.Tag = Integer(dhtTemporal))  then begin

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -49 +49 @@
     procedure TabControlChange(Sender: TObject); virtual;
     procedure PaintSite(DC: HDC); override;
-    procedure DoSetVisible(const AValue: Boolean); override;
-    procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
     procedure Switch(Index: Integer); override;
     procedure PopupMenuTabCloseClick(Sender: TObject);
+    procedure SetVisible(const AValue: Boolean); override;
     property DockItems: TObjectList read FDockItems write FDockItems;
   end;
@@ -82 +81 @@
   with TCDManagerTabs(Manager) do begin
     if TControl(Sender).Visible then begin
+      UpdateClientSize;
       Switch(DockItems.IndexOf(FindControlInPanels(TControl(Sender))));
-      TCDManagerTabsItem(DockItems[DockItems.IndexOf(FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
-    end;
-    UpdateClientSize;
+      TCDManagerTabsItem(DockItems[DockItems.IndexOf(
+        FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
+    end else UpdateClientSize;
   end;
 
   // Show current dock clients in parent dock sites
   if TControl(Sender).Visible then
-    if Assigned(TControl(Sender).HostDockSite) then
+    if Assigned(TControl(Sender).HostDockSite) then begin
+      //TControl(Sender).HostDockSite.DockManager.;
       TControl(Sender).HostDockSite.Visible := True;
-
-  {Temp := TControl(Sender);
-  if Assigned(Control) then
-  begin
-    ControlVisible := TControl(Sender).Visible;
-    (*if Assigned(ClientAreaPanel) then
-      ClientAreaPanel.Visible := ControlVisible;
-    if Assigned(Splitter) then
-      Splitter.Visible := ControlVisible;
-      *)
-//    if Assigned(TCDManager(OwnerDockManager).DockStyleHandler) then
-    if Assigned(Manager) then
-    with TCDManagerTabs(Manager) do
-    begin
-      //UpdateClientSize;
-      if ControlVisible then
-        Switch(FDockItems.IndexOf(FindControlInPanels(TControl(Sender))));
-      if not (Control is TWinControl) then raise Exception.Create('Not TWinControl');
-      if not Assigned(Control) then raise Exception.Create('Control not assigned');
-      ChangeVisible(TWinControl(Control), ControlVisible);
-      // Show parent control
-      Temp := TControl(Sender).HostDockSite;
-
-      if ControlVisible then
-        TControl(Sender).HostDockSite.Visible := ControlVisible;
-    end;
-    if csDestroying in Control.ComponentState then Control := nil;
-  end;
-  }
+    end;
 end;
 
@@ -141 +114 @@
   if Assigned(PageControl.ActivePage) then
     TCDManagerItem(DockItems[PageControl.TabIndex]).Control.Hide;
+end;
+
+procedure TCDManagerTabs.SetVisible(const AValue: Boolean);
+begin
+  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;
 end;
 
@@ -255 +240 @@
 
     NewItem.Control := TWinControl(Control);
+    //NewItem.HideType := dhtTemporal;
     Control.AddHandlerOnVisibleChanged(NewItem.VisibleChange);
+    Control.AddHandlerOnVisibleChanging(NewItem.VisibleChanging);
     //AControl.Parent := NewItem.ClientAreaPanel;
     Control.Align := alClient;
@@ -272 +259 @@
   if Assigned(ManagerItem) then begin
     Control.RemoveHandlerOnVisibleChanged(ManagerItem.VisibleChange);
+    Control.RemoveHandlerOnVisibleChanging(ManagerItem.VisibleChanging);
   end; //else raise Exception.Create(Format('Control %s not found in DockItems', [Control.Name]));
 
@@ -388 +376 @@
 end;
 
-procedure TCDManagerTabs.DoSetVisible(const AValue: Boolean);
-begin
-  inherited;
-    if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockItems.Count) then
-      with TCDManagerItem(DockItems[PageControl.TabIndex]) do begin
-        //Show;
-        //ShowMessage(IntToStr(Control.Tag));
-        if AValue and (not Control.Visible) and (Control.Tag = Integer(dhtTemporal))  then begin
-          Control.Show;
-          Control.Tag := Integer(dhtPermanent);
-        end;
-        //TabControl.Show;
-        //ClientAreaPanel.Show;
-      end;
-end;
-
-procedure TCDManagerTabs.ChangeVisible(Control: TWinControl; Visible: Boolean);
-var
-  I: Integer;
-begin
-  inherited;
-  if not Visible then begin
-    //if Assigned(TWinControl(Control).DockManager) then
-    //with TCDManager(TWinControl(Control).DockManager) do
-    begin
-//    ShowMessage(IntToStr(TabControl.TabIndex) + ' ' + IntToStr(DockPanels.Count));
-//    TabControl.Tabs[0].;
-//    if (TabControl.TabIndex >= 0) and (TabControl.TabIndex < DockPanels.Count) then begin
-//      TCDClientPanel(DockPanels[TabControl.TabIndex]).Show;
-//      TCDClientPanel(DockPanels[TabControl.TabIndex]).Control.Show;
-//    end;
-    //    ShowMessage(IntToStr(DockPanels.Count));
-        //TabImageList.Delete(PageControl.Tabs.IndexOf(Control.Caption));
-
-        I := DockItems.IndexOf(FindControlInPanels(Control));
-        if Control.Tag = Integer(dhtPermanent) then
-        if (I <> -1) and (I < PageControl.PageCount) then
-  //        Control.Hide;
-          PageControl.Page[I].TabVisible := False;
-        //Control.Tag := 0;
-//      end;
-    end;
-  end else
-  begin
-//    if Assigned(TWinControl(Control).DockManager) then
-//    with TCDManager(TWinControl(Control).DockManager) do
-    begin
-//      if Control.Tag = 0 then begin
-        I := DockItems.IndexOf(FindControlInPanels(Control));
-        //if  then
-        if I <> -1 then
-          PageControl.Page[I].TabVisible := True;
-//      TabImageList.Add(TCDClientPanel(TCDManager(Manager).FindControlInPanels(Control)).Header.Icon.Picture.Bitmap, nil);
-//      TabControl.Tabs.Add(Control.Caption);
-
-//      end;
-    end;
-  end;
-end;
-
 end.
 

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -246 +246 @@
     C.Align := alClient;
     C.Parent := HeaderPanel.ControlPanel;
+    HeaderPanel.Header.Control := C;
     //AutoHide.Control.Align := alCustom;
     //Pos := DockSite.ClientToScreen(Pos);