diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | pango/makefile.msc | 4 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 2 |
4 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,10 @@ +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 + 2005-07-30 Owen Taylor <otaylor@redhat.com> * configure.in: Use egrep for khmer, like the rest, to diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 147a64f4..019b5729 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +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 + 2005-07-30 Owen Taylor <otaylor@redhat.com> * configure.in: Use egrep for khmer, like the rest, to 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; |