palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-10-02 21:31:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed issue #851. Mouse click on a highlighted object crashes Valentina.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-05-24 09:56:19 +03:00
parent c6e38932dc
commit bb95c3162b
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libs/vwidgets/vmaingraphicsview.cpp
View file

@ -536,32 +536,25 @@ void VMainGraphicsView::mousePressEvent(QMouseEvent *event)
{ {
QGraphicsView::setDragMode(QGraphicsView::RubberBandDrag); QGraphicsView::setDragMode(QGraphicsView::RubberBandDrag);
} }
if (showToolOptions) if (showToolOptions)
{ {
QList<QGraphicsItem *> list = items(event->pos()); bool success = false;
if (list.size() == 0) const QList<QGraphicsItem *> list = items(event->pos());
{
emit itemClicked(nullptr);
break;
}
const QList<QGraphicsItem *> sceneItems = this->scene()->items();
for (auto item : list) for (auto item : list)
{ {
if (sceneItems.contains(item)) if (item && item->type() > QGraphicsItem::UserType && item->type() <= VSimpleCurve::Type)
{
if (item->type() > QGraphicsItem::UserType && item->type() <= VSimpleCurve::Type)
{ {
emit itemClicked(item); emit itemClicked(item);
break; success = true;
} }
else }
if (not success)
{ {
emit itemClicked(nullptr); emit itemClicked(nullptr);
} }
} }
}
}
break; break;
} }
case Qt::MiddleButton: case Qt::MiddleButton: