Changeset 437

Timestamp:

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

Author:

chronos

Message:

• Fixed: Better switching tabbed controls.

Location:

Docking/CoolDocking

Files:

• Managers/UCDManagerRegions.pas (modified) (2 diffs)
• Managers/UCDManagerTabs.pas (modified) (8 diffs)
• Managers/UCDManagerTabsPopup.pas (modified) (3 diffs)
• Patches (added)
• Patches/PageControl Tab switch test.zip (added)
• Patches/custompage.inc.patch (added)
• UCDClient.pas (modified) (2 diffs)
• UCDCommon.pas (modified) (1 diff)
• UCDCustomize.pas (modified) (2 diffs)
• UCDLayout.pas (modified) (1 diff)
• UCDManager.pas (modified) (10 diffs)
• UCDMaster.pas (modified) (2 diffs)
• UCDPopupMenu.pas (modified) (3 diffs)
• UCDResource.pas (modified) (1 diff)
• UCDWindowList.pas (modified) (1 diff)

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 }

Docking/CoolDocking/UCDClient.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, Controls, LCLType, LMessages, Graphics, StdCtrls,
-  Buttons, ExtCtrls, Contnrs, Forms, ComCtrls, Dialogs, Menus, FileUtil,
-  UCDCustomize, DOM, XMLWrite, XMLRead, UCDCommon,
-  DateUtils, UCDPopupMenu, UCDManager;
+  Classes, SysUtils, Controls, Graphics,
+  Buttons, ExtCtrls, Forms, Dialogs, Menus,
+  UCDCustomize, UCDCommon;
 
 const
@@ -26 +25 @@
     procedure SetDockable(const AValue: Boolean);
     procedure SetFloatable(const AValue: Boolean);
+  protected
     procedure SetPanel(const AValue: TPanel); override;
   public

Docking/CoolDocking/UCDCommon.pas

@@ -66 +66 @@
     FPanel: TPanel;
     procedure SetMaster(const AValue: TCDMasterBase);
-  public
+  protected
     procedure SetPanel(const AValue: TPanel); virtual;
   published

Docking/CoolDocking/UCDCustomize.pas

@@ -1 +1 @@
 unit UCDCustomize;
 
-{$mode Delphi}{$H+}
+{$mode delphi}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, StdCtrls, Spin, UCDLayout, UCDCommon, UCDManager;
+  Classes, LResources, Forms, Dialogs,
+  ComCtrls, StdCtrls, Spin, UCDLayout, UCDCommon;
 
 type
@@ -64 +64 @@
 
 uses
-  UCDClient, UCDMaster;
+  UCDMaster;
 
 resourcestring

Docking/CoolDocking/UCDLayout.pas

@@ -73 +73 @@
 
 uses
-  UCDClient, UCDManager, UCDConjoinForm;
+  UCDManager, UCDConjoinForm;
 
 procedure Register;

Docking/CoolDocking/UCDManager.pas

@@ -104 +104 @@
     procedure SetMoveDuration(const AValue: Integer);
     procedure CloseHandler(Sender: TObject; var CloseAction: TCloseAction);
+  protected
+    procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
+      DropCtl: TControl); virtual;
+    function GetHeaderPos: THeaderPos; virtual;
+    function FindControlInPanels(Control: TControl): TCDManagerItem; virtual;
   public
     Locked: Boolean;
@@ -114 +119 @@
     procedure Switch(Index: Integer); virtual;
     procedure ChangeVisible(Control: TWinControl; Visible: Boolean); virtual;
-    procedure Assign(Source: TCDManager); virtual;
-    procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
-      DropCtl: TControl); virtual;
-    function GetHeaderPos: THeaderPos; virtual;
+    procedure Assign(Source: TPersistent); override;
     procedure BringToFront; virtual;
 
@@ -141 +143 @@
     function AutoFreeByControl: Boolean; override;
 
-    function FindControlInPanels(Control: TControl): TCDManagerItem; virtual;
     function CreateConjoinForm: TCDConjoinForm;
     function CreateDockableForm: TCDPanelForm;
@@ -364 +365 @@
 function TCDManager.GetMoveDuration: Integer;
 begin
-
+  Result := 0;
 end;
 
@@ -379 +380 @@
 
 constructor TCDManager.Create(ADockSite: TWinControl);
-var
-  NewMenuItem: TMenuItem;
-  NewMenuItem2: TMenuItem;
 begin
   inherited Create(ADockSite);
@@ -524 +522 @@
 
 procedure TCDManager.ResetBounds(Force: Boolean);
-var
-  I: Integer;
-  Control: TControl;
-  R: TRect;
 begin
 end;
@@ -552 +546 @@
   NewConjoinDockForm := TCDConjoinForm.Create(Application);
   NewConjoinDockForm.Name := GetUniqueName('ConjoinForm');
-  NewConjoinDockForm.Visible := True;
+  NewConjoinDockForm.Visible := False;
   NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect;
   NewConjoinDockForm.CoolDockClient.Master := Self.Master;
@@ -580 +574 @@
 procedure TCDManager.SetDockStyle(const AValue: TCDStyleType);
 var
-  I: Integer;
   NewManager: TCDManager;
 begin
@@ -646 +639 @@
 end;
 
-procedure TCDManager.Assign(Source: TCDManager);
-begin
-  FDockStyle := Source.FDockStyle;
-  FDockSite := Source.FDockSite;
+procedure TCDManager.Assign(Source: TPersistent);
+begin
+  if Source is TCDManager then begin
+    FDockStyle := TCDManager(Source).FDockStyle;
+    FDockSite := TCDManager(Source).FDockSite;
+  end else inherited;
 end;
 
@@ -718 +713 @@
   Points: array of TPoint;
   TitleLeft: Integer;
-  TitleWidth: Integer;
   TitleMaxWidth: Integer;
   I: Integer;

Docking/CoolDocking/UCDMaster.pas

@@ -1 +1 @@
 unit UCDMaster;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, UCDCommon, UCDManager;
+  Classes, SysUtils, UCDCommon;
 
 type
@@ -68 +68 @@
 
 destructor TCDMaster.Destroy;
-var
-  I: Integer;
 begin
   // Assigning nil to Client Master property cause unregistring client from list

Docking/CoolDocking/UCDPopupMenu.pas

@@ -44 +44 @@
 
 uses
-  UCDClient, UCDManagerTabs, UCDCustomize, UCDManager;
+  UCDManagerTabs, UCDCustomize, UCDManager;
 
 resourcestring
@@ -91 +91 @@
   NewMenuItem: TMenuItem;
   NewMenuItem2: TMenuItem;
-  I: Integer;
 begin
   inherited Create(nil);
@@ -199 +198 @@
 
 procedure TCDPopupMenu.PopupMenuCloseClick(Sender: TObject);
-var
-  Control: TControl;
 begin
   if PopupComponent is TPageControl then

Docking/CoolDocking/UCDResource.pas

@@ -1 +1 @@
 unit UCDResource;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface

Docking/CoolDocking/UCDWindowList.pas

@@ -1 +1 @@
 unit UCDWindowList; 
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface