Changeset 437 for Docking/CoolDocking/Managers

Timestamp:

Nov 19, 2012, 2:34:58 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Better switching tabbed controls.

Location:

Docking/CoolDocking/Managers

Files:

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

Docking/CoolDocking/Managers/UCDManagerRegions.pas

@@ -51 +51 @@
       DropCtl: TControl); override;
     procedure RemoveControl(Control: TControl); override;
-    constructor Create(ADockSite: TWinControl);
+    constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
     procedure PaintSite(DC: HDC); override;
     procedure Update; override;
     procedure SetVisible(const AValue: Boolean); override;
-    procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
+    procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
     property DockDirection: TCDDirection read FDockDirection
       write FDockDirection;
@@ -93 +93 @@
 
 procedure TCDManagerRegionsItem.Paint(Sender: TObject);
-var
-  I: Integer;
-  R: TRect;
 begin
   inherited Paint(Sender);

Docking/CoolDocking/Managers/UCDManagerTabs.pas

@@ -8 +8 @@
   Classes, Controls, ExtCtrls, ComCtrls, SysUtils, Dialogs, Contnrs,
   Menus, Forms, UCDCommon, UCDManager, UCDConjoinForm,
-  LCLType, LMessages, Graphics;
+  LCLType, Graphics;
 
 type
@@ -35 +35 @@
     procedure TabControlMouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure PageControlContextPopup(Sender: TObject; MousePos: TPoint;
+      var Handled: Boolean);
+    function FindTabSheet(TabSheet: TTabSheet): TCDManagerTabsItem;
+  protected
+    function GetHeaderPos: THeaderPos; override;
+    function FindControlInPanels(Control: TControl): TCDManagerItem; override;
     procedure InsertControlPanel(AControl: TControl; InsertAt: TAlign;
       DropCtl: TControl); override;
-    function FindControlInPanels(Control: TControl): TCDManagerItem; override;
-    function GetHeaderPos: THeaderPos; override;
-    function FindTabSheet(TabSheet: TTabSheet): TCDManagerTabsItem;
-    procedure PageControlContextPopup(Sender: TObject; MousePos: TPoint;
-      var Handled: Boolean);
+    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); virtual;
+    procedure TabControlChange(Sender: TObject); virtual;
   public
     MouseDownSkip: Boolean;
@@ -49 +52 @@
     procedure Update; override;
     procedure SetHeaderPos(const AValue: THeaderPos); override;
-    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); virtual;
     procedure RemoveControl(Control: TControl); override;
     constructor Create(ADockSite: TWinControl); override;
     destructor Destroy; override;
-    procedure TabControlChange(Sender: TObject); virtual;
     procedure PaintSite(DC: HDC); override;
     procedure Switch(Index: Integer); override;
@@ -84 +85 @@
   Temp: TControl;
   Temp2: TControl;
+  PI: Integer;
 begin
   DebugLog('TCDManagerTabsItem.VisibleChange');
@@ -92 +94 @@
       //TCDManagerTabsItem(DockItems[DockItems.IndexOf(
       //  FindControlInPanels(TControl(Sender)))]).HideType := dhtPermanent;
-    end else Update;
+    end else begin
+      TabSheet.TabVisible := False;
+
+      // Workaround for not showing current tab agter other tab is hidden
+      PI := PageControl.PageIndex;
+      PageControl.PageIndex := -1;
+      PageControl.PageIndex := PI;
+
+      Update;
+    end;
   end;
 
@@ -379 +390 @@
   LastIndex: Integer;
 begin
-  LastIndex := PageControl.TabIndex;
+  LastIndex := PageControl.PageIndex;
   if FUpdateCount = 0 then begin
   DebugLog('TCDManagerTabs.Update');
@@ -426 +437 @@
     if PageControl.PageIndex = I then begin
       TCDManager(Control.DockManager).DockSiteVisible := True;
-      if not Control.Visible then Control.Show;
+      if not Control.Visible then
+        Control.Show;
       //PageControl.TabIndex := I;
     end else begin
@@ -437 +449 @@
     //TCDClientPanel(FDockPanels[I]).DockPanelPaint(Self);
   end;
-  end;
-  inherited;
-  //ShowMessage(IntToStr(PageControl.TabIndex));
-  PageControl.TabIndex := LastIndex;
+  //PageControl.TabIndex := LastIndex;
+  //if PageControl.PageIndex = PI then
+  //  PageControl.PageIndex := -1; // Workaround for bug in LCL TPageControl.TabVisible not updating PageIndex properly
+  end;
+  inherited;
 end;
 

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -56 +56 @@
     SplitterMousePos: TPoint;
     procedure PageControlResize(Sender: TObject);
-    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); override;
     procedure SplitterMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -64 +63 @@
       Shift: TShiftState; X, Y: Integer);
     procedure UpdatePopupFormBounds;
+    procedure PopupFormMouseLeave(Sender: TObject);
+  protected
     procedure TabControlChange(Sender: TObject); override;
-    procedure PopupFormMouseLeave(Sender: TObject);
+    procedure InsertControlNoUpdate(Control: TControl; InsertAt: TAlign); override;
   public
     AutoHideEnabled: Boolean;
@@ -84 +85 @@
 
 uses
-  UCDClient, UCDManagerRegions;
+  UCDManagerRegions;
 
 { TCDManagerTabsPopupItem }