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

Merge branch 'IDE/CustomTitle/UnhandledMacros' into 'main'

Browse Source 
IDE: In the custom IDE title, leave only unexpanded macros in their original form

See merge request freepascal.org/lazarus/lazarus!364
This commit is contained in:
Martin 2024-10-20 21:55:10 +00:00
commit 201f40d091
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/main.pp
View File

@ -9014,6 +9014,7 @@ procedure TMainIDE.UpdateCaption;
var var
rev, NewCaption, NewTitle, ProjectName, DirName, CustomnCaption: String; rev, NewCaption, NewTitle, ProjectName, DirName, CustomnCaption: String;
OldMarkUnhandledMacros: boolean;
begin begin
if MainIDEBar = nil then Exit; if MainIDEBar = nil then Exit;
if ToolStatus = itExiting then Exit; if ToolStatus = itExiting then Exit;
@ -9049,11 +9050,13 @@ begin
if (GlobalMacroList <> nil) then begin if (GlobalMacroList <> nil) then begin
CustomnCaption := EnvironmentGuiOpts.Desktop.IDETitleBarCustomText; CustomnCaption := EnvironmentGuiOpts.Desktop.IDETitleBarCustomText;
if CustomnCaption <> '' then begin if CustomnCaption <> '' then begin
if not GlobalMacroList.SubstituteStr(CustomnCaption) then OldMarkUnhandledMacros := GlobalMacroList.MarkUnhandledMacros;
CustomnCaption := EnvironmentGuiOpts.Desktop.IDETitleBarCustomText; GlobalMacroList.MarkUnhandledMacros := false;
GlobalMacroList.SubstituteStr(CustomnCaption);
if CustomnCaption <> '' then begin if CustomnCaption <> '' then begin
NewCaption := AddToCaption(NewCaption, CustomnCaption); NewCaption := AddToCaption(NewCaption, CustomnCaption);
end; end;
GlobalMacroList.MarkUnhandledMacros := OldMarkUnhandledMacros;
end; end;
end; end;