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

LCL-GTK3: Simplify code for font attributes, remove pango_attr_list_ref() call. Issue #36297.

Browse Source 
git-svn-id: trunk@62287 -
This commit is contained in:
juha 2019-11-23 17:39:22 +00:00
parent f570285874
commit aef6a43ae0
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,7 +523,6 @@ end;
constructor TGtk3Font.Create(ALogFont: TLogFont; const ALongFontName: String);
var
AContext: PPangoContext;
ADescription: PPangoFontDescription;
AttrList: PPangoAttrList;
Attr: PPangoAttribute;
begin
@ -535,16 +534,10 @@ begin
if Gtk3WidgetSet.DefaultAppFontName <> '' then
FHandle := pango_font_description_from_string(PgChar(Gtk3WidgetSet.DefaultAppFontName))
else
begin
ADescription := pango_context_get_font_description(AContext);
FHandle := pango_font_description_copy(ADescription);
end;
FFontName := FHandle^.get_family;
FHandle := pango_font_description_copy(pango_context_get_font_description(AContext));
end else
begin
FHandle := pango_font_description_from_string(PgChar(FFontName));
FFontName := FHandle^.get_family;
end;
FFontName := FHandle^.get_family;
if ALogFont.lfHeight <> 0 then
FHandle^.set_absolute_size(Abs(ALogFont.lfHeight) * PANGO_SCALE);
if ALogFont.lfItalic > 0 then
@ -558,7 +551,6 @@ begin
AttrList := pango_layout_get_attributes(FLayout);
if (AttrList = nil) then
AttrList := pango_attr_list_new();
pango_attr_list_ref(AttrList);
if ALogFont.lfUnderline <> 0 then
Attr := pango_attr_underline_new(PANGO_UNDERLINE_SINGLE)
else