Changeset 176 for Docking/CoolDocking/UCoolDockStyleTabs.pas

Timestamp:

Mar 7, 2011, 1:32:07 PM (13 years ago)

Author:

george

Message:

• Fixed: Docking popupmenu action Close and Rename.
• Added: Partialy implemented tab hiding.

File:

• Docking/CoolDocking/UCoolDockStyleTabs.pas (modified) (9 diffs)

Docking/CoolDocking/UCoolDockStyleTabs.pas

@@ -71 +71 @@
   // Hide all clients
   with TCoolDockManager(Manager) do
-  for I := 0 to DockPanels.Count - 1 do begin
-    TCoolDockClientPanel(DockPanels[I]).Control.Hide;
-    TCoolDockClientPanel(DockPanels[I]).ClientAreaPanel.Hide;
-    TCoolDockClientPanel(DockPanels[I]).ClientAreaPanel.Parent := DockSite;
-    TCoolDockClientPanel(DockPanels[I]).Control.Align := alClient;
-    //ShowMessage(TCoolDockClientPanel(DockPanels[I]).Control.ClassName);
-    Application.ProcessMessages;
-
-    // Workaround for "Cannot focus" error
-    TForm(TCoolDockClientPanel(DockPanels[I]).Control).ActiveControl := nil;
-  end;
+  for I := 0 to DockPanels.Count - 1 do
+    if TCoolDockClientPanel(DockPanels[I]).Control.Visible then begin
+      TCoolDockClientPanel(DockPanels[I]).Control.Tag := 1;
+      TCoolDockClientPanel(DockPanels[I]).Control.Hide;
+      TCoolDockClientPanel(DockPanels[I]).ClientAreaPanel.Hide;
+      TCoolDockClientPanel(DockPanels[I]).ClientAreaPanel.Parent := DockSite;
+      TCoolDockClientPanel(DockPanels[I]).Control.Align := alClient;
+      //ShowMessage(TCoolDockClientPanel(DockPanels[I]).Control.ClassName);
+      Application.ProcessMessages;
+
+      // Workaround for "Cannot focus" error
+      TForm(TCoolDockClientPanel(DockPanels[I]).Control).ActiveControl := nil;
+    end;
 
   // Show selected
@@ -88 +90 @@
     with TCoolDockClientPanel(DockPanels[TabControl.TabIndex]), ClientAreaPanel do begin
       Control.Show;
+      Control.Tag := 0;
       (*AutoHide.Enable := True;
       if AutoHide.Enable then begin
@@ -160 +163 @@
   TabImageList.Clear;
   with TCoolDockManager(Manager) do
-  for I := 0 to DockPanels.Count - 1 do begin
+  for I := 0 to DockPanels.Count - 1 do
+  if TCoolDockClientPanel(DockPanels[I]).Control.Visible then begin
+    TCoolDockClientPanel(DockPanels[I]).Control.Tag := 1;
     TabControl.Tabs.Add(TCoolDockClientPanel(DockPanels[I]).Control.Caption);
     TabImageList.Add(TCoolDockClientPanel(DockPanels[I]).Header.Icon.Picture.Bitmap, nil);
@@ -187 +192 @@
 begin
   inherited;
-  TabControl.Tabs.Add(AControl.Caption);
-  TabImageList.Add(NewPanel.Header.Icon.Picture.Bitmap, nil);
-  if Assigned(NewPanel.Splitter) then
-    NewPanel.Splitter.Visible := False;
-  NewPanel.ClientAreaPanel.Visible := False;
-  NewPanel.Visible := False;
-  TabControlChange(Self);
+  if AControl.Visible then begin
+    AControl.Tag := 1;
+    TabControl.Tabs.Add(AControl.Caption);
+    TabImageList.Add(NewPanel.Header.Icon.Picture.Bitmap, nil);
+    if Assigned(NewPanel.Splitter) then
+      NewPanel.Splitter.Visible := False;
+    NewPanel.ClientAreaPanel.Visible := False;
+    NewPanel.Visible := False;
+    TabControlChange(Self);
+  end;
 end;
 
@@ -216 +224 @@
       with TCoolDockClientPanel(DockPanels[TabControl.TabIndex]) do begin
         //Show;
-        if AValue then Control.Show;
+        if AValue and (not Control.Visible) and (Control.Tag = 1) then begin
+          Control.Show;
+          Control.Tag := 0;
+        end;
         //TabControl.Show;
         //ClientAreaPanel.Show;
@@ -227 +238 @@
 begin
   inherited;
-  if not Visible then
-  if Assigned(TWinControl(Control).DockManager) then
-  with TCoolDockManager(TWinControl(Control).DockManager) do begin
+  if not Visible then begin
+    if Assigned(TWinControl(Control).DockManager) then
+    with TCoolDockManager(TWinControl(Control).DockManager) do begin
 //    ShowMessage(IntToStr(TabControl.TabIndex) + ' ' + IntToStr(DockPanels.Count));
 //    TabControl.Tabs[0].;
@@ -237 +248 @@
 //    end;
     //    ShowMessage(IntToStr(DockPanels.Count));
+      if Control.Tag = 0 then begin
+        TabImageList.Delete(TabControl.Tabs.IndexOf(Control.Caption));
+
+        with TabControl.Tabs do
+          Delete(IndexOf(Control.Caption));
+      end;
+    end;
+  end else
+  begin
+    if Control.Tag = 0 then begin
+      TabImageList.Add(TCoolDockClientPanel(TCoolDockManager(Manager).FindControlInPanels(Control)).Header.Icon.Picture.Bitmap, nil);
+      TabControl.Tabs.Add(Control.Caption);
+    end;
   end;
 end;
@@ -242 +266 @@
 procedure TCoolDockStyleTabs.SetTabsPos(const AValue: THeaderPos);
 begin
-  (*if FTabsPos = AValue then Exit;
+  if FTabsPos = AValue then Exit;
   FTabsPos := AValue;
   with TabControl do
@@ -266 +290 @@
       Height := GrabberSize;
     end;
-  end;       *)
+  end;
 end;