From 0d935e023b575feea43c63de9e08da697acaf5bb Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sun, 18 Mar 2012 18:46:36 +0000 Subject: [PATCH] neutrino: GUI Painting of Vol. Mute and Clock (Part1) - Added getDigitHeight() and getDigitOffset() to fontrenderer (better numerics display) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2151 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0aeeb601bdc660b0707a041730d9ee3909b1e26c Author: Michael Liebmann Date: 2012-03-18 (Sun, 18 Mar 2012) Origin message was: ------------------ * neutrino: GUI Painting of Vol. Mute and Clock (Part1) - Added getDigitHeight() and getDigitOffset() to fontrenderer (better numerics display) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2151 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/driver/fontrenderer.cpp | 12 ++++++++++++ src/driver/fontrenderer.h | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/driver/fontrenderer.cpp b/src/driver/fontrenderer.cpp index 84385943e..662e3968a 100644 --- a/src/driver/fontrenderer.cpp +++ b/src/driver/fontrenderer.cpp @@ -292,6 +292,8 @@ return 0; upper = halflinegap+ascender+3; // we add 3 at top lower = -descender+halflinegap+1; // we add 1 at bottom height=upper+lower; // this is total height == distance of lines + DigitHeight = ascender+2; + DigitOffset = -descender+halflinegap; // hack end //printf("glyph: hM=%d tM=%d hg=%d tg=%d ascender=%d descender=%d height=%d linegap/2=%d upper=%d lower=%d\n", @@ -310,6 +312,16 @@ int Font::getHeight(void) return height; } +int Font::getDigitHeight(void) +{ + return DigitHeight; +} + +int Font::getDigitOffset(void) +{ + return DigitOffset; +} + int UTF8ToUnicode(const char * &text, const bool utf8_encoded) // returns -1 on error { int unicode_value; diff --git a/src/driver/fontrenderer.h b/src/driver/fontrenderer.h index 28d519ea7..e10baf6dc 100644 --- a/src/driver/fontrenderer.h +++ b/src/driver/fontrenderer.h @@ -51,7 +51,7 @@ class Font FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit); // these are HACKED values, because the font metrics were unusable. - int height,ascender,descender,upper,lower; + int height,DigitHeight,DigitOffset,ascender,descender,upper,lower; int fontwidth; public: @@ -68,6 +68,8 @@ class Font int getRenderWidth(const char * text, const bool utf8_encoded = false); int getRenderWidth(const std::string & text, const bool utf8_encoded = false); int getHeight(void); + int getDigitHeight(void); + int getDigitOffset(void); int getWidth(void); int getSize(){return font.width;} int setSize(int isize);