mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-28 21:00:43 +02:00
Qt: fixed non ascii utf8 chars in TQtWidgetSet.ExtTextOut() when we use dx param. issue #22795
git-svn-id: trunk@38610 -
This commit is contained in:
parent
a06d48f63f
commit
468cd5b4d1
@ -2200,13 +2200,11 @@ var
|
|||||||
CharLen := UTF8CharacterLength(CurStr);
|
CharLen := UTF8CharacterLength(CurStr);
|
||||||
if AClipped then
|
if AClipped then
|
||||||
begin
|
begin
|
||||||
W := StrPas(CurStr);
|
W := GetUTF8String(Copy(CurStr, 1, CharLen));
|
||||||
W := UTF8Copy(W, 1, CharLen);
|
|
||||||
QtDC.drawText(CurX, Y, Rect^.Right - Rect^.Left, Rect^.Bottom - Rect^.Top, 0, @W);
|
QtDC.drawText(CurX, Y, Rect^.Right - Rect^.Left, Rect^.Bottom - Rect^.Top, 0, @W);
|
||||||
end else
|
end else
|
||||||
begin
|
begin
|
||||||
W := StrPas(CurStr);
|
W := GetUTF8String(Copy(CurStr, 1, CharLen));
|
||||||
W := UTF8Copy(W, 1, CharLen);
|
|
||||||
QtDC.drawText(CurX, Y, @W);
|
QtDC.drawText(CurX, Y, @W);
|
||||||
end;
|
end;
|
||||||
inc(CurX, CurDx^);
|
inc(CurX, CurDx^);
|
||||||
|
Loading…
Reference in New Issue
Block a user