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

SynEdit: experimental charwidth, restore alternative call

Browse Source
This commit is contained in:
Martin 2025-02-23 12:27:22 +01:00
parent bdf387d20f
commit 66f8a5dcb5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/synedit/synedittextsystemcharwidth.pas
View File

@ -38,7 +38,9 @@ uses
{$IFDEF WindowsDesktop} windows, {$endif}
Classes, SysUtils,
{$IFDEF WindowsDesktop}
{$IFDEF WithSynExperimentalCharWidth}
Types,
{$ENDIF}
{$endif}
LazSynEditText, SynTextDrawer, LazUTF8, Controls, Graphics,
LazLoggerBase;
@ -82,7 +84,9 @@ end;
procedure TSynEditStringSystemWidthChars.DoGetPhysicalCharWidths(Line: PChar; LineLen,
Index: Integer; PWidths: PPhysicalCharWidth);
var
{$IFDEF WithSynExperimentalCharWidth}
i: DWORD;
{$ENDIF}
cpRes: TGCPRESULTSW;
outs: array of widechar;
order, dx, caret: array of integer;
@ -101,7 +105,7 @@ begin
debugln(LOG_SynSystemWidthChars, ['TSynEditStringSystemWidthChars NO HANDLE ']);
exit;
end;
if TextDrawer= nil then exit;;
if TextDrawer= nil then exit;
SetLength(s, LineLen+1); // wide chars of UTF-16 <= bytes of UTF-8 string
if ConvertUTF8ToUTF16(PWideChar(s), LineLen+1, Line, LineLen, [toInvalidCharToSymbol], l) <> trNoError then
@ -131,6 +135,9 @@ if TextDrawer= nil then exit;;
debugln(LOG_SynSystemWidthChars, ['TSynEditStringSystemWidthChars FAILED for line ', Index]);
exit;
end;
{$else}
GetCharacterPlacementW(FHandleOwner.Handle, pwidechar(s), length(s), 0,
@cpRes, GCP_DIACRITIC + GCP_KASHIDA + GCP_LIGATE);
{$endif}
k := 0; // index for order