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

LCL-GTK3: Fix a crash when rendering underline or strikeout text. Issue #36297, patch from Anton Kavalenka.

Browse Source 
git-svn-id: trunk@62253 -
This commit is contained in:
juha 2019-11-17 09:41:35 +00:00
parent 45b2dae59f
commit 237822aec4
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,7 +525,6 @@ var
AContext: PPangoContext;
ADescription: PPangoFontDescription;
AttrList: PPangoAttrList;
AttrListTemporary: Boolean;
Attr: PPangoAttribute;
begin
FLogFont := ALogFont;
@ -548,24 +547,18 @@ begin
end;
if ALogFont.lfHeight <> 0 then
FHandle^.set_absolute_size(Abs(ALogFont.lfHeight) * PANGO_SCALE);
if ALogFont.lfItalic > 0 then
FHandle^.set_style(PANGO_STYLE_ITALIC);
FHandle^.set_weight(ALogFont.lfWeight);
FLayout := pango_layout_new(AContext);
FLayout^.set_font_description(FHandle);
if (ALogFont.lfUnderline<>0) or (ALogFont.lfStrikeOut<>0) then
begin
AttrListTemporary := false;
AttrList := pango_layout_get_attributes(FLayout);
if (AttrList = nil) then
begin
AttrList := pango_attr_list_new();
AttrListTemporary := True;
end;
pango_attr_list_ref(AttrList);
if ALogFont.lfUnderline <> 0 then
Attr := pango_attr_underline_new(PANGO_UNDERLINE_SINGLE)
else
@ -574,13 +567,9 @@ begin
Attr := pango_attr_strikethrough_new(ALogFont.lfStrikeOut<>0);
pango_attr_list_change(AttrList, Attr);
pango_layout_set_attributes(FLayout, AttrList);
if AttrListTemporary then
pango_attr_list_unref(AttrList);
pango_attr_list_unref(AttrList);
end;
g_object_unref(AContext);
end;