paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 00:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Improve getting an unused name for a new Notebook page. Issue #36957.

Browse Source
This commit is contained in:
Juha 2025-03-07 18:11:12 +02:00
parent 7ce60d77d9
commit da72bc4790
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lcl/include/notebook.inc
View File

@ -11,6 +11,26 @@
*****************************************************************************
}
function CreateUniquePageName(BaseName: string; OwnerComp: TComponent): string;
// Inspired by TCustomFormEditor.CreateUniqueComponentName
var
i, j: integer;
begin
i:=0;
Result:=BaseName;
while true do begin
j:=OwnerComp.ComponentCount-1;
while (j>=0) and (CompareText(Result,OwnerComp.Components[j].Name)<>0) do
dec(j);
if j<0 then exit;
inc(i);
if BaseName[length(BaseName)] in ['0'..'9'] then
BaseName:=BaseName+'_';
Result:=BaseName+IntToStr(i);
end;
end;
{******************************************************************************
TUNBPages
******************************************************************************}
@ -69,29 +89,11 @@ end;
function TUNBPages.AddObject(const S: string; AObject: TObject): Integer;
var
NewPage: TPage;
NewName: string;
OK: Boolean;
i: integer;
begin
Result := FPageList.Add(AObject);
NewPage := TPage(AObject);
if IsValidIdent(S) then
begin
NewName := S;
i := 1;
repeat
OK := True;
try
NewPage.Name := NewName;
except // Name was reserved, try adding numbers to it.
on E: EComponentError do begin
OK := False;
NewName := S + IntToStr(i);
Inc(i);
end;
end;
until OK;
end;
NewPage.Name := CreateUniquePageName(S, FNotebook.Owner);
NewPage.Caption := S;
NewPage.Parent := FNotebook;
NewPage.Align := alClient;