paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 10:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: PageControl, fixed active page should not change (same tabsheet, may be at new index) if moving pages

Browse Source 
git-svn-id: trunk@42680 -
This commit is contained in:
martin 2013-09-08 14:24:16 +00:00
parent 01192bcac9
commit ae2989ecac
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcl/include/customnotebook.inc
View File

@ -174,9 +174,16 @@ procedure TNBPages.Move(CurIndex, NewIndex: Integer);
var var
APage: TCustomPage; APage: TCustomPage;
NewControlIndex, NewPageIndex: integer; NewControlIndex, NewPageIndex: integer;
ActivePageIndex: Integer;
ActivePage: TCustomPage;
begin begin
if CurIndex = NewIndex then Exit; if CurIndex = NewIndex then Exit;
NewPageIndex := NewIndex; ActivePageIndex := FNotebook.PageIndex;
if (FNotebook.PageIndex >= 0) and (FNotebook.PageIndex < Count) then
ActivePage := GetPage(ActivePageIndex)
else
ActivePage := nil;
//NewPageIndex := NewIndex;
APage := TCustomPage(FPageList[CurIndex]); APage := TCustomPage(FPageList[CurIndex]);
@ -186,21 +193,6 @@ begin
else else
NewControlIndex := FNotebook.GetControlIndex(TCustomPage(FPageList[NewIndex])); NewControlIndex := FNotebook.GetControlIndex(TCustomPage(FPageList[NewIndex]));
// calculate new PageIndex
if FNotebook.PageIndex = CurIndex then
NewPageIndex := NewIndex
else
if FNotebook.PageIndex > CurIndex then
begin
if FNotebook.PageIndex <= NewIndex then
NewPageIndex := FNotebook.PageIndex - 1;
end
else
begin
if FNotebook.PageIndex >= NewIndex then
NewPageIndex := FNotebook.PageIndex + 1;
end;
FNotebook.DisableAutoSizing; FNotebook.DisableAutoSizing;
try try
// move Page in notebook handle // move Page in notebook handle
@ -213,7 +205,11 @@ begin
FNotebook.SetControlIndex(APage, NewControlIndex); FNotebook.SetControlIndex(APage, NewControlIndex);
// update PageIndex // update PageIndex
FNotebook.PageIndex := NewPageIndex; if ActivePage <> nil then
FNotebook.PageIndex := IndexOfPage(ActivePage)
else // Can not restore an invalid page index.
if FNotebook.PageIndex >= 0 then // keep if -1
FNotebook.PageIndex := NewIndex;
finally finally
FNotebook.EnableAutoSizing; FNotebook.EnableAutoSizing;
end; end;