Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct text extent to not require active painter

Browse Source
This commit is contained in:
Sean D'Epagnier
2016-08-26 16:42:16 -04:00
committed by Vadim Zeitlin
parent cc01fbc3c0
commit 988bc8b306
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/dc.cpp
View File

@@ -347,9 +347,11 @@ void wxQtDCImpl::DoGetTextExtent(const wxString& string,
wxCoord *externalLeading, wxCoord *externalLeading,
const wxFont *theFont ) const const wxFont *theFont ) const
{ {
QFont f = m_qtPainter->font(); QFont f;
if (theFont != NULL) if (theFont != NULL)
f = theFont->GetHandle(); f = theFont->GetHandle();
else
f = m_font.GetHandle();
QFontMetrics metrics(f); QFontMetrics metrics(f);
if (x != NULL || y != NULL) if (x != NULL || y != NULL)