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

applied patch #9933 from Ales Katona which improved gtk2 FontDialog getting it's info from TFont

Browse Source 
git-svn-id: trunk@12448 -
This commit is contained in:
andrew 2007-10-13 21:49:11 +00:00
parent 38b3450528
commit 86ec18eb66
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lcl/interfaces/gtk/gtkobject.inc
View File

@ -4463,6 +4463,10 @@ var
FontType: TGtkFontType; FontType: TGtkFontType;
const const
FixedFilter: array [0..2] of PChar = ( 'c', 'm', nil ); FixedFilter: array [0..2] of PChar = ( 'c', 'm', nil );
{$ELSE}
var
FontDesc: PPangoFontDescription;
TmpStr: pChar;
{$ENDIF} {$ENDIF}
begin begin
SelWidget := gtk_font_selection_dialog_new(Title); SelWidget := gtk_font_selection_dialog_new(Title);
@ -4488,7 +4492,33 @@ begin
// set font name in XLFD format // set font name in XLFD format
if IsFontNameXLogicalFontDesc(FontDialog.Font.Name) then if IsFontNameXLogicalFontDesc(FontDialog.Font.Name) then
gtk_font_selection_dialog_set_font_name(PGtkFontSelectionDialog(SelWidget), gtk_font_selection_dialog_set_font_name(PGtkFontSelectionDialog(SelWidget),
PChar(FontDialog.Font.Name)); PChar(FontDialog.Font.Name))
else begin
{$ifdef GTK2}
FontDesc := pango_font_description_new;
with FontDialog.Font do begin
pango_font_description_set_size(FontDesc, Size * PANGO_SCALE);
if fsBold in Style then
pango_font_description_set_weight(FontDesc, PANGO_WEIGHT_BOLD)
else
pango_font_description_set_weight(FontDesc, PANGO_WEIGHT_NORMAL);
if fsItalic in Style then
pango_font_description_set_style(FontDesc, PANGO_STYLE_ITALIC)
else
pango_font_description_set_style(FontDesc, PANGO_STYLE_NORMAL);
pango_font_description_set_family(FontDesc, pChar(Name));
end;
TmpStr := pango_font_description_to_string(FontDesc);
gtk_font_selection_dialog_set_font_name(PGtkFontSelectionDialog(SelWidget), TmpStr);
g_free(TmpStr);
pango_font_description_free(FontDesc);
{$else}
debugln('Gtk1 should have IsFontNameXLogicalFontDesc true!');
{$endif}
end;
{$IFDEF GTK1} {$IFDEF GTK1}
{ This functionality does not seem to be available in GTK2 } { This functionality does not seem to be available in GTK2 }