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

GCC build fix GetTextExtent inline needed to be defined in header

Browse Source
This commit is contained in:
Mark Watkins 2015-09-06 12:36:44 +10:00
parent ff4a29cb26
commit c56ae98139
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sleepyhead/Graphs/gGraph.cpp
View File

@ -1430,26 +1430,6 @@ int gGraph::minHeight()
return minheight; return minheight;
} }
inline void GetTextExtent(QString text, int &width, int &height, QFont *font)
{
#ifdef ENABLE_THREADED_DRAWING
static QMutex mut;
mut.lock();
#endif
QFontMetrics fm(*font);
//#ifdef Q_OS_WIN32
QRect r = fm.boundingRect(text);
width = r.width();
height = r.height();
//#else
// width=fm.width(text);
// height=fm.xHeight()+2; // doesn't work properly on windows..
//#endif
#ifdef ENABLE_THREADED_DRAWING
mut.unlock();
#endif
}
int GetXHeight(QFont *font) int GetXHeight(QFont *font)
{ {
QFontMetrics fm(*font); QFontMetrics fm(*font);

8
sleepyhead/Graphs/gGraph.h
View File

@ -34,6 +34,14 @@ void DestroyGraphGlobals();
const int mouse_movement_threshold = 6; const int mouse_movement_threshold = 6;
inline void GetTextExtent(QString text, int &width, int &height, QFont *font)
{
QFontMetrics fm(*font);
QRect r = fm.boundingRect(text);
width = r.width();
height = r.height();
}
/*! \class gGraph /*! \class gGraph
\brief Single Graph object, containing multiple layers and Layer layout code \brief Single Graph object, containing multiple layers and Layer layout code
*/ */