From 2e966ea14d201636d5d9ea4429c7e61f73a4ef8e Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Sat, 22 Feb 2003 00:16:36 +0000 Subject: [PATCH] * Source/xlib/XGFont.m ([XGFontInfo -setupAttributes]): Use ascender and descender informaton of the X11 font instead of using maximum bounding box. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@16041 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/xlib/XGFont.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e08d918..d0f1765 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-02-20 Willem Rein Oudshoorn + + * Source/xlib/XGFont.m ([XGFontInfo -setupAttributes]): Use + ascender and descender informaton of the X11 font instead of using + maximum bounding box. + 2003-02-19 Adam Fedor * Source/gsc/GSStreamContext.m (fpfloat): New function. Used everywhere diff --git a/Source/xlib/XGFont.m b/Source/xlib/XGFont.m index ef24012..f5617e9 100644 --- a/Source/xlib/XGFont.m +++ b/Source/xlib/XGFont.m @@ -298,10 +298,10 @@ static BOOL XGInitAtoms(Display *dpy) [fontDictionary setObject: familyName forKey: NSAFMFamilyName]; isFixedPitch = XGFontIsFixedPitch(xdpy, font_info); isBaseFont = NO; - ascender = font_info->max_bounds.ascent; + ascender = font_info->ascent; [fontDictionary setObject: [NSNumber numberWithFloat: ascender] forKey: NSAFMAscender]; - descender = -(font_info->max_bounds.descent); + descender = -(font_info->descent); [fontDictionary setObject: [NSNumber numberWithFloat: descender] forKey: NSAFMDescender]; fontBBox = NSMakeRect(