Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't get ascent/descent informations about a font because it's not 

useful at the moment (commented out).
This commit is contained in:
Arnaud Fontaine 2008-03-17 16:55:38 +00:00 committed by Julien Danjou
parent 542a944361
commit f75f16c325
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/draw.c
View File

@ -126,8 +126,6 @@ draw_font_new(Display *disp, char *fontname)
cairo_t *cr; cairo_t *cr;
PangoLayout *layout; PangoLayout *layout;
font_t *font = p_new(font_t, 1); font_t *font = p_new(font_t, 1);
PangoContext *context;
PangoFontMetrics *font_metrics;
/* Create a dummy cairo surface, cairo context and pango layout in /* Create a dummy cairo surface, cairo context and pango layout in
* order to get font informations */ * order to get font informations */
@ -147,6 +145,12 @@ draw_font_new(Display *disp, char *fontname)
/* Get height */ /* Get height */
pango_layout_get_pixel_size(layout, NULL, &font->height); pango_layout_get_pixel_size(layout, NULL, &font->height);
/* At the moment, we don't need ascent/descent but maybe it could
* be useful in the future... */
#if 0
PangoContext *context;
PangoFontMetrics *font_metrics;
/* Get ascent and descent */ /* Get ascent and descent */
context = pango_layout_get_context(layout); context = pango_layout_get_context(layout);
font_metrics = pango_context_get_metrics(context, font->desc, NULL); font_metrics = pango_context_get_metrics(context, font->desc, NULL);
@ -156,6 +160,8 @@ draw_font_new(Display *disp, char *fontname)
font->descent = PANGO_PIXELS(pango_font_metrics_get_descent(font_metrics)); font->descent = PANGO_PIXELS(pango_font_metrics_get_descent(font_metrics));
pango_font_metrics_unref(font_metrics); pango_font_metrics_unref(font_metrics);
#endif
g_object_unref(layout); g_object_unref(layout);
cairo_destroy(cr); cairo_destroy(cr);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);

2
common/draw.h
View File

@ -85,8 +85,6 @@ typedef struct
{ {
PangoFontDescription *desc; PangoFontDescription *desc;
int height; int height;
int ascent;
int descent;
} font_t; } font_t;
typedef struct typedef struct