feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix form editor locking after dragging a 3D object over it

Browse Source 
Also some code style cleanups.

Task-number: QDS-1529
Change-Id: Ie40763d11801adc91860a30e493240e797c4a752
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2020-01-27 15:57:15 +02:00
parent 7a239ff62f
commit 5dcd9685f9
1 changed files with 24 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/qmldesigner/components/formeditor/dragtool.cpp
View File

@@ -60,17 +60,9 @@ void DragTool::clear()
m_movingItem = nullptr; m_movingItem = nullptr;
} }
void DragTool::mousePressEvent(const QList<QGraphicsItem*> &, QGraphicsSceneMouseEvent *) void DragTool::mousePressEvent(const QList<QGraphicsItem *> &, QGraphicsSceneMouseEvent *) {}
{ void DragTool::mouseMoveEvent(const QList<QGraphicsItem *> &, QGraphicsSceneMouseEvent *) {}
} void DragTool::hoverMoveEvent(const QList<QGraphicsItem *> &, QGraphicsSceneMouseEvent *) {}
void DragTool::mouseMoveEvent(const QList<QGraphicsItem*> &, QGraphicsSceneMouseEvent *)
{
}
void DragTool::hoverMoveEvent(const QList<QGraphicsItem*> &, QGraphicsSceneMouseEvent * /*event*/)
{
}
void DragTool::keyPressEvent(QKeyEvent *event) void DragTool::keyPressEvent(QKeyEvent *event)
{ {
@@ -82,32 +74,12 @@ void DragTool::keyPressEvent(QKeyEvent *event)
} }
} }
void DragTool::keyReleaseEvent(QKeyEvent *) void DragTool::keyReleaseEvent(QKeyEvent *) {}
{ void DragTool::mouseReleaseEvent(const QList<QGraphicsItem *> &, QGraphicsSceneMouseEvent *) {}
} void DragTool::mouseDoubleClickEvent(const QList<QGraphicsItem *> &, QGraphicsSceneMouseEvent *) {}
void DragTool::itemsAboutToRemoved(const QList<FormEditorItem *> &) {}
void DragTool::selectedItemsChanged(const QList<FormEditorItem *> &) {}
void DragTool::mouseReleaseEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneMouseEvent *) void DragTool::updateMoveManipulator() {}
{
}
void DragTool::mouseDoubleClickEvent(const QList<QGraphicsItem*> & /*itemList*/, QGraphicsSceneMouseEvent * /*event*/)
{
}
void DragTool::itemsAboutToRemoved(const QList<FormEditorItem*> & /* removedItemList */)
{
}
void DragTool::selectedItemsChanged(const QList<FormEditorItem*> &)
{
}
void DragTool::updateMoveManipulator()
{
}
void DragTool::beginWithPoint(const QPointF &beginPoint) void DragTool::beginWithPoint(const QPointF &beginPoint)
{ {
@@ -183,9 +155,7 @@ void DragTool::instancesParentChanged(const QList<FormEditorItem *> &itemList)
m_moveManipulator.synchronizeInstanceParent(itemList); m_moveManipulator.synchronizeInstanceParent(itemList);
} }
void DragTool::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > & /*propertyList*/) void DragTool::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &) {}
{
}
void DragTool::clearMoveDelay() void DragTool::clearMoveDelay()
{ {
@@ -196,9 +166,7 @@ void DragTool::clearMoveDelay()
} }
} }
void DragTool::focusLost() void DragTool::focusLost() {}
{
}
void DragTool::abort() void DragTool::abort()
{ {
@@ -304,10 +272,10 @@ void DragTool::dragLeaveEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphi
m_dragNode.destroy(); m_dragNode.destroy();
commitTransaction(); commitTransaction();
}
view()->changeToSelectionTool(); view()->changeToSelectionTool();
} }
}
static QString libraryResourceImageName(const QMimeData *mimeData) static QString libraryResourceImageName(const QMimeData *mimeData)
{ {