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

Gtk3: Make widgetset wrap non-ansi strings properly. Patch by Anton Kavalennka. issue #36288

Browse Source 
git-svn-id: trunk@62226 -
This commit is contained in:
zeljko 2019-11-10 14:09:10 +00:00
parent d2504e98d1
commit 346361fb60
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/gtk3/gtk3objects.pas
View File

@ -2005,7 +2005,7 @@ var
AInkRect: TPangoRectangle; AInkRect: TPangoRectangle;
ALogicalRect: TPangoRectangle; ALogicalRect: TPangoRectangle;
AMetrics: PPangoFontMetrics; AMetrics: PPangoFontMetrics;
ACharWidth: gint; ACharWidth,ATextWidth,ATextHeight: gint;
begin begin
NewStr:=Str; NewStr:=Str;
// first check if Str contains an ampersand: // first check if Str contains an ampersand:
@ -2038,8 +2038,10 @@ begin
descent^ := AMetrics^.get_descent; descent^ := AMetrics^.get_descent;
if width <> nil then if width <> nil then
begin begin
ACharWidth := AMetrics^.get_approximate_char_width; {ACharWidth := AMetrics^.get_approximate_char_width;
width^ := (StrLength * ACharWidth) div PANGO_SCALE; width^ := (utf8length(Str, StrLength) * ACharWidth) div PANGO_SCALE;}
TheFont.Layout^.get_pixel_size(@ATextWidth, @ATextHeight);
width^:=ATextWidth;
end; end;
// PANGO_PIXELS(char_width) // PANGO_PIXELS(char_width)