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:
zeljko 2012-09-10 11:07:53 +00:00
parent a06d48f63f
commit 468cd5b4d1

View File

@ -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^);