From 3ecb94fc21ab968d44eecbc76a12216ce7da685f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 1 Jan 2017 16:46:49 +0100 Subject: [PATCH] fontrenderer.cpp: Use additional percentage height offset. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Different font types could have different glyph heights, Therfore static values seems not really senseful. eg. chars like ÄÁÂÅÈÉÊËÌÍÎÏÑÒÓÕÖÙÛÜÝ could paint over defined height, Note: However, depending of implementations, the font image may change. Most likely this must be adapted to some parts. --- src/driver/fontrenderer.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/driver/fontrenderer.cpp b/src/driver/fontrenderer.cpp index 29a42be01..d43684626 100644 --- a/src/driver/fontrenderer.cpp +++ b/src/driver/fontrenderer.cpp @@ -287,10 +287,14 @@ return 0; ascender=tM; descender=tg-hg; //this is a negative value! int halflinegap= -(descender>>1); // |descender/2| - we use descender as linegap, half at top, half at bottom - upper = halflinegap+ascender+3; // we add 3 at top - lower = -descender+halflinegap+1; // we add 1 at bottom + + //hack: Use additional percentage height offset, font types could have different heights, static values seems not really senseful. + upper = halflinegap+ascender+hg/7; // we add 1/7 of glyph height at top + lower = -descender+halflinegap-hg/10; // we add 1/10 of glyph height at bottom + height=upper+lower; // this is total height == distance of lines - DigitHeight = ascender+2; + + DigitHeight = ascender+2; //Is this static value really ok? DigitOffset = -descender+halflinegap; // hack end