diff options
| author | Scott Gilbertson <scottg@mantatest.com> | 2003-06-10 01:50:12 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-06-10 01:50:12 +0000 |
| commit | 0940ed88c4ad38b6d220cf337da4192556c9aca6 (patch) | |
| tree | c4c052107d3a09e1a5cb407136393068014a0705 | |
| parent | 4665e56c27a42868f98ab9fe93e60da977dcf20e (diff) | |
| download | gcc-0940ed88c4ad38b6d220cf337da4192556c9aca6.zip gcc-0940ed88c4ad38b6d220cf337da4192556c9aca6.tar.gz gcc-0940ed88c4ad38b6d220cf337da4192556c9aca6.tar.bz2 | |
natFont.cc (getMaxAscent): adjusted return value.
2003-06-09 Scott Gilbertson <scottg@mantatest.com>
* gnu/gcj/xlib/natFont.cc (getMaxAscent): adjusted return value.
(getMaxDescent): adjusted return value.
(getAscent): modified to use metrics for 'O'.
(getDescent): modified to use metrics for 'y'.
From-SVN: r67692
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/gcj/xlib/natFont.cc | 18 |
2 files changed, 21 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d0b1a4d..3fdf18f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-06-09 Scott Gilbertson <scottg@mantatest.com> + + * gnu/gcj/xlib/natFont.cc (getMaxAscent): adjusted return value. + (getMaxDescent): adjusted return value. + (getAscent): modified to use metrics for 'O'. + (getDescent): modified to use metrics for 'y'. + 2003-06-08 Anthony Green <green@redhat.com> * java/net/URLStreamHandler.java (sameFile): Fix port value diff --git a/libjava/gnu/gcj/xlib/natFont.cc b/libjava/gnu/gcj/xlib/natFont.cc index 0f8f43d..c929d22 100644 --- a/libjava/gnu/gcj/xlib/natFont.cc +++ b/libjava/gnu/gcj/xlib/natFont.cc @@ -44,25 +44,35 @@ jint gnu::gcj::xlib::Font::getXIDFromStruct(gnu::gcj::RawData* structure) jint gnu::gcj::xlib::Font::getMaxAscent() { XFontStruct* fontStruct = (XFontStruct*) structure; - return fontStruct->max_bounds.ascent; + return fontStruct->max_bounds.ascent+1; // +1 to include the baseline } jint gnu::gcj::xlib::Font::getMaxDescent() { XFontStruct* fontStruct = (XFontStruct*) structure; - return fontStruct->max_bounds.descent; + return fontStruct->max_bounds.descent-1; // -1 to exclude the baseline } jint gnu::gcj::xlib::Font::getAscent() { XFontStruct* fontStruct = (XFontStruct*) structure; - return fontStruct->ascent; + jint returnValue = fontStruct->ascent; + if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'O') + returnValue = fontStruct + ->per_char[(unsigned)'O'-fontStruct->min_char_or_byte2] + ->ascent; + return returnValue+1; // +1 to include the baseline } jint gnu::gcj::xlib::Font::getDescent() { XFontStruct* fontStruct = (XFontStruct*) structure; - return fontStruct->ascent; + jint returnValue = fontStruct->descent; + if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'y') + returnValue = fontStruct + ->per_char[(unsigned)'y'-fontStruct->min_char_or_byte2] + ->descent; + return returnValue-1; // -1 to exclude the baseline } jint gnu::gcj::xlib::Font::getStringWidth(java::lang::String* text) |