mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: TreeViewMenu - wrong caption when it includes '&' and non ASCII characters

Browse source
This commit is contained in:
Alexander Koblov 2021-01-13 17:18:06 +00:00
commit c38caafeed
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ftreeviewmenu.pas
View file

@ -1190,7 +1190,7 @@ var
var
iChar: integer;
begin
if UTF8Pos('&', sMenuCaption) = 0 then
if Pos('&', sMenuCaption) = 0 then
begin
Result := sMenuCaption;
end
@ -1198,15 +1198,15 @@ var
begin
Result := '';
iChar := 1;
while iChar <= UTF8Length(sMenuCaption) do
while iChar <= Length(sMenuCaption) do
begin
if copy(sMenuCaption, iChar, 1) <> '&' then
Result := Result + copy(sMenuCaption, iChar, 1)
if sMenuCaption[iChar] <> '&' then
Result := Result + sMenuCaption[iChar]
else
begin
if iChar < UTF8Length(sMenuCaption) then
if iChar < Length(sMenuCaption) then
begin
if copy(sMenuCaption, iChar + 1, 1) = '&' then
if sMenuCaption[iChar + 1] = '&' then
begin
Result := Result + '&';
Inc(iChar);