From a2d18c15a41e2a3d40e04712bd7ef09db97ba066 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 2 Aug 2016 21:16:15 +0300 Subject: [PATCH] Fix broken VTextGraphicsItem::paint. --HG-- branch : develop --- src/libs/vtools/tools/vtextgraphicsitem.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/vtools/tools/vtextgraphicsitem.cpp b/src/libs/vtools/tools/vtextgraphicsitem.cpp index 5314a7d2a..a5f4a3a81 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.cpp +++ b/src/libs/vtools/tools/vtextgraphicsitem.cpp @@ -93,18 +93,17 @@ void VTextGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem painter->setPen(Qt::black); QFont fnt = m_tm.GetFont(); + // draw text lines + int iY = 0; for (int i = 0; i < m_tm.GetCount(); ++i) { const TextLine& tl = m_tm.GetLine(i); - // draw text lines - int iY = 0; - int iH = tl.m_iHeight; fnt.setPixelSize(m_tm.GetFont().pixelSize() + tl.m_iFontSize); fnt.setWeight(tl.m_eFontWeight); fnt.setStyle(tl.m_eStyle); painter->setFont(fnt); - painter->drawText(0, iY, qRound(boundingRect().width()), iH, tl.m_eAlign, tl.m_qsText); - iY += iH + m_tm.GetSpacing(); + painter->drawText(0, iY, qRound(boundingRect().width()), tl.m_iHeight, tl.m_eAlign, tl.m_qsText); + iY += tl.m_iHeight + m_tm.GetSpacing(); } // now draw the features specific to non-normal modes