summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2005-07-30 18:41:44 +0000
committerHans Breuer <hans@src.gnome.org>2005-07-30 18:41:44 +0000
commitf8965c84fc66aec15e399ee1855c13033a5e432e (patch)
tree3ecd6f10d9710aea608267da8f055e132d3171df /pango
parenteafc70b0d7ffd52f6c60cf8d5794ac5f2c00e2c7 (diff)
downloadpango-f8965c84fc66aec15e399ee1855c13033a5e432e.tar.gz
updated
2005-07-30 Hans Breuer <hans@breuer.org> * pango/makefile.msc : updated * pango/pangocairo-win32font.c(...get_metrics) : dont use ascent where descent is meant. Fixes size of edit boxes for gtk+-2.7
Diffstat (limited to 'pango')
-rw-r--r--pango/makefile.msc4
-rw-r--r--pango/pangocairo-win32font.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 3d29ec01..32e164b6 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -177,8 +177,8 @@ OBJECTS = \
pangocairo-render.obj \
pangocairo-win32font.obj \
pangocairo-win32fontmap.obj \
- pangocairo-fcfont.obj \
- pangocairo-fcfontmap.obj \
+# pangocairo-fcfont.obj \
+# pangocairo-fcfontmap.obj \
!ENDIF
!IFDEF OBJS_querymodules
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c
index 9dcbe335..aef7fa04 100644
--- a/pango/pangocairo-win32font.c
+++ b/pango/pangocairo-win32font.c
@@ -225,7 +225,7 @@ pango_cairo_win32_font_get_metrics (PangoFont *font,
cairo_scaled_font_extents (scaled_font, &font_extents);
cwfont->metrics->ascent = font_extents.ascent * PANGO_SCALE;
- cwfont->metrics->descent = font_extents.ascent * PANGO_SCALE;
+ cwfont->metrics->descent = font_extents.descent * PANGO_SCALE;
cwfont->metrics->approximate_char_width = font_extents.max_x_advance * PANGO_SCALE;
cwfont->metrics->approximate_digit_width = font_extents.max_x_advance * PANGO_SCALE;