From 1dece5cb7799912bc51679b225291164c2b3ffc5 Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 20 Oct 2016 18:57:22 +0000 Subject: [PATCH] Revert change because we can't select handler for ellipse git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4754 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/qetshapeitem.cpp | 34 +++++++++++------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/sources/qetgraphicsitem/qetshapeitem.cpp b/sources/qetgraphicsitem/qetshapeitem.cpp index cbdd3238b..37d0d5531 100644 --- a/sources/qetgraphicsitem/qetshapeitem.cpp +++ b/sources/qetgraphicsitem/qetshapeitem.cpp @@ -246,27 +246,23 @@ QPainterPath QetShapeItem::shape() const pps.setJoinStyle(Qt::RoundJoin); path = pps.createStroke(path); - /** - Code below is commented to avoid weird bug see : QPainterPath Conductor::shape() const - for more information - **/ -// if (isSelected()) -// { -// QVector vector; + if (isSelected()) + { + QVector vector; -// if (m_shapeType == Line) -// vector << m_P1 << m_P2; -// else if (m_shapeType == Rectangle || m_shapeType == Ellipse) { -// QRectF rect (m_P1, m_P2); -// vector << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft(); -// } -// else -// vector = m_polygon; - -// foreach(QRectF r, m_handler.handlerRect(vector)) -// path.addRect(r); -// } + if (m_shapeType == Line) + vector << m_P1 << m_P2; + else if (m_shapeType == Rectangle || m_shapeType == Ellipse) { + QRectF rect (m_P1, m_P2); + vector << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft(); + } + else + vector = m_polygon; + foreach(QRectF r, m_handler.handlerRect(vector)) + path.addRect(r); + } + path.addRect(path.boundingRect()); return (path); }