git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use different messagebox actions and restore old OKCancelActions
[enigma2.git]
/
lib
/
gdi
/
font.cpp
diff --git
a/lib/gdi/font.cpp
b/lib/gdi/font.cpp
index 1471aa5ef6e82435c6bdcd3f15f9ee8c72b0b017..1f09d1bc25cddd51505fb15c1a75fcc7ac74a1d2 100644
(file)
--- a/
lib/gdi/font.cpp
+++ b/
lib/gdi/font.cpp
@@
-205,12
+205,10
@@
float fontRenderClass::getLineHeight(const gFont& font)
return 0;
}
int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
return 0;
}
int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
- float height=(current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap/2.0)/64;
- delete fnt;
+ float height=(current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)/64.0;
return height;
}
return height;
}
-
fontRenderClass::~fontRenderClass()
{
singleLock s(ftlock);
fontRenderClass::~fontRenderClass()
{
singleLock s(ftlock);
@@
-386,7
+384,7
@@
void eTextPara::newLine(int flags)
cursor.setX(left);
previous=0;
int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
cursor.setX(left);
previous=0;
int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
- cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap
*1/2
)>>6);
+ cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)>>6);
if (maximum.height()<cursor.y())
maximum.setHeight(cursor.y());
previous=0;
if (maximum.height()<cursor.y())
maximum.setHeight(cursor.y());
previous=0;