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

SynEdit: Improve GetPhysicalCharWidths in paint.

Browse Source
This commit is contained in:
Martin 2024-01-21 00:49:38 +01:00
parent db688e717c
commit fad67e71ec
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/synedit/lazsyntextarea.pp
View File

@ -54,7 +54,7 @@ type
FLinesView: TSynEditStrings;
FMarkupManager: TSynEditMarkupManager;
FCharWidths: TPhysicalCharWidths;
FCharWidths, FCharWidths2: TPhysicalCharWidths;
FCharWidthsLen: Integer;
FCurTxtLineIdx : Integer;
FCurLineByteLen: Integer;
@ -314,6 +314,7 @@ end;
procedure TLazSynPaintTokenBreaker.Finish;
begin
FCharWidths := nil;
FCharWidths2 := nil;
end;
procedure TLazSynPaintTokenBreaker.SetHighlighterTokensLine(ALine: TLineIdx; out
@ -322,9 +323,17 @@ var
LogLeftPos: Integer;
begin
FDisplayView.SetHighlighterTokensLine(ALine, ARealLine, LogLeftPos, FCurLineByteLen);
FCharWidths := FLinesView.GetPhysicalCharWidths(ARealLine);
FCharWidthsLen := Length(FCharWidths);
FLinesView.GetPhysicalCharWidths(ARealLine, FCharWidths, FCharWidthsLen);
if FLinesView.LogPhysConvertor.CurrentLine = ARealLine then begin
FCharWidths2 := FCharWidths;
FCharWidths :=FLinesView.LogPhysConvertor.CurrentWidthsDirect;
end
else begin
if FCharWidths2 <> nil then begin
FCharWidths := FCharWidths2;
FCharWidths2 := nil;
end;
FLinesView.GetPhysicalCharWidths(ARealLine, FCharWidths, FCharWidthsLen);
end;
FCurLineByteLen := FCurLineByteLen + LogLeftPos - 1;
FCurViewToken.TokenLength := 0;
@ -1790,6 +1799,7 @@ var
rcLine.Left := DrawLeft;
LineBufferRtlLogPos := -1;
CharWidths := nil; // keep refcnt = 1 -- in case they get resized
FTokenBreaker.SetHighlighterTokensLine(TV + CurLine, CurTextIndex);
CharWidths := FTokenBreaker.CharWidths;
fMarkupManager.PrepareMarkupForRow(CurTextIndex+1);