aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected some warnings

Browse Source 
--HG--
branch : feature
This commit is contained in:
BojanKverh 2016-06-29 23:39:52 +02:00
parent 83ec6e219a
commit caa13f06ac
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/libs/vtools/tools/vtextgraphicsitem.cpp
View File

@ -67,6 +67,7 @@ void VTextGraphicsItem::SetFont(const QFont& fnt)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VTextGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void VTextGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
Q_UNUSED(widget);
painter->fillRect(option->rect, QColor(251, 251, 175)); painter->fillRect(option->rect, QColor(251, 251, 175));
// draw text lines // draw text lines
@ -162,18 +163,21 @@ QRectF VTextGraphicsItem::boundingRect() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VTextGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *pME) void VTextGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *pME)
{ {
m_ptStart = pME->pos(); if ((pME->buttons() & Qt::LeftButton) > 0)
m_szStart = m_rectBoundingBox.size();
if (m_rectResize.contains(m_ptStart) == true)
{ {
m_eMode = mResize; m_ptStart = pME->pos();
m_szStart = m_rectBoundingBox.size();
if (m_rectResize.contains(m_ptStart) == true)
{
m_eMode = mResize;
}
else
{
m_eMode = mMove;
}
setZValue(3);
UpdateBox();
} }
else
{
m_eMode = mMove;
}
setZValue(3);
UpdateBox();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -196,17 +200,20 @@ void VTextGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent* pME)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VTextGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* pME) void VTextGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* pME)
{ {
if (m_eMode == mMove) if ((pME->buttons() & Qt::LeftButton) > 0)
{ {
emit SignalMoved(pos()); if (m_eMode == mMove)
UpdateBox(); {
emit SignalMoved(pos());
UpdateBox();
}
else
{
emit SignalResized(m_rectBoundingBox.width(), m_font.pixelSize());
Update();
}
m_eMode = mActivated;
} }
else
{
emit SignalResized(m_rectBoundingBox.width(), m_font.pixelSize());
Update();
}
m_eMode = mActivated;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------