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

gtk2:

Browse Source 
- check for bold stlye when creating a default font
  - set correct default font family

git-svn-id: trunk@17047 -
This commit is contained in:
paul 2008-10-19 03:33:45 +00:00
parent 47bf617f69
commit 00a23f0df7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -109,7 +109,7 @@ begin
Exit;
end;
if (lfHeight = 0) and (CompareText(lfFacename, 'default') = 0) then
if (lfHeight = 0) and (lfWeight <> FW_BOLD) and (CompareText(lfFacename, 'default') = 0) then
begin
// use default font
{$IFDEF VerboseFonts}
@ -142,8 +142,20 @@ begin
FullString:=IntToStr(aSize)
else
FullString:='';
FullString := AFamily + ' ' + aStyle + ' ' + FullString;
if aFamily = 'default' then
begin
CurFont := GetDefaultGtkFont(False);
if PANGO_IS_LAYOUT(CurFont) then
begin
PangoDesc := pango_layout_get_font_description(CurFont);
if PangoDesc = nil then
PangoDesc := pango_context_get_font_description(pango_layout_get_context(CurFont));
aFamily := StrPas(pango_font_description_get_family(PangoDesc));
end;
end;
FullString := AFamily + ' ' + aStyle + ' ' + FullString;
PangoDesc := pango_font_description_from_string(PChar(FullString));
if lfWeight <> FW_DONTCARE then