diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-01 01:06:04 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-01 01:06:04 +0000 |
| commit | e5ceaa48e4db781002fc1ff66febf9fd11de95b9 (patch) | |
| tree | 387247633424ca806973424720b15024435a431f /src | |
| parent | f58d0e15d7d60300ac49cea2aedb517f9dc57dcb (diff) | |
Use ascent/descent for Xft fonts.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2152 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_font_xft.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index f8115d902..da88b4096 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_xft.cxx,v 1.4.2.3 2002/04/18 21:07:53 easysw Exp $" +// "$Id: fl_font_xft.cxx,v 1.4.2.4 2002/05/01 01:06:04 easysw Exp $" // // Xft font code for the Fast Light Tool Kit (FLTK). // @@ -148,15 +148,8 @@ Fl_FontSize::~Fl_FontSize() { // XftFontClose(fl_display, font); } -#if 0 -// Some of the line spacings these return are insanely big! -//int fl_height() { return current_font->height; } int fl_height() { return current_font->ascent + current_font->descent; } int fl_descent() { return current_font->descent; } -#else -int fl_height() { return fl_size_;} -int fl_descent() { return fl_size_/4;} -#endif double fl_width(const char *str, int n) { XGlyphInfo i; @@ -233,5 +226,5 @@ void fl_draw(const char *str, int n, int x, int y) { } // -// End of "$Id: fl_font_xft.cxx,v 1.4.2.3 2002/04/18 21:07:53 easysw Exp $" +// End of "$Id: fl_font_xft.cxx,v 1.4.2.4 2002/05/01 01:06:04 easysw Exp $" // |