chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fontmeterics for QT < 11

Browse Source
This commit is contained in:
LoudSnorer 2023-02-19 13:30:36 -05:00
parent c61d1508cb
commit 465b4124e6
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/Graphs/gGraphView.cpp
View File

@ -947,7 +947,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
if (q.angle == 0) { if (q.angle == 0) {
painter.drawText(q.x, q.y, q.text); painter.drawText(q.x, q.y, q.text);
} else { } else {
#if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
w = painter.fontMetrics().horizontalAdvance(q.text); w = painter.fontMetrics().horizontalAdvance(q.text);
#else
w = painter.fontMetrics().width(q.text);
#endif
h = painter.fontMetrics().xHeight() + 2; h = painter.fontMetrics().xHeight() + 2;
painter.translate(q.x, q.y); painter.translate(q.x, q.y);
@ -972,7 +976,11 @@ void gGraphView::DrawTextQue(QPainter &painter)
if (q.angle == 0) { if (q.angle == 0) {
painter.drawText(q.rect, q.flags, q.text); painter.drawText(q.rect, q.flags, q.text);
} else { } else {
#if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
w = painter.fontMetrics().horizontalAdvance(q.text); w = painter.fontMetrics().horizontalAdvance(q.text);
#else
w = painter.fontMetrics().width(q.text);
#endif
h = painter.fontMetrics().xHeight() + 2; h = painter.fontMetrics().xHeight() + 2;
painter.translate(q.rect.x(), q.rect.y()); painter.translate(q.rect.x(), q.rect.y());
@ -1013,7 +1021,11 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
if (!QPixmapCache::find(hstr, &pm)) { if (!QPixmapCache::find(hstr, &pm)) {
QFontMetrics fm(*q.font); QFontMetrics fm(*q.font);
w = fm.horizontalAdvance(q.text); #if (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
w = painter.fontMetrics().horizontalAdvance(q.text);
#else
w = painter.fontMetrics().width(q.text);
#endif
h = fm.height()+buf; h = fm.height()+buf;
pm = QPixmap(w, h); pm = QPixmap(w, h);