procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change to xg_get_font.

Browse source 
* gtkutil.c (xg_get_font): Use pango_units_to_double.
This commit is contained in:
Dmitry Antipov 2012-08-15 17:40:00 +08:00 • committed by Chong Yidong
parent 8453bb5523
commit 5bf192caba
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-08-15 Dmitry Antipov <dmantipov@yandex.ru>
* gtkutil.c (xg_get_font): Use pango_units_to_double.
2012-08-15 Chong Yidong <cyd@gnu.org>
* gtkutil.c (xg_get_font): Rename from xg_get_font_name. When

6
src/gtkutil.c
View file

@ -2101,15 +2101,15 @@ xg_get_font (FRAME_PTR f, const char *default_name)
{
Lisp_Object args[8];
const char *name = pango_font_description_get_family (desc);
gint size = pango_font_description_get_size (desc);
PangoWeight weight = pango_font_description_get_weight (desc);
PangoStyle style = pango_font_description_get_style (desc);
PangoStyle style = pango_font_description_get_style (desc);
args[0] = QCname;
args[1] = build_string (name);
args[2] = QCsize;
args[3] = make_float (((double) pango_font_description_get_size (desc))
/ PANGO_SCALE);
args[3] = make_float (pango_units_to_double (size));
args[4] = QCweight;
args[5] = XG_WEIGHT_TO_SYMBOL (weight);