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

78
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)
{ {
@@ -151,7 +123,7 @@ void DragTool::createQmlItemNodeFromImage(const QString &imageName,
} }
} }
FormEditorItem* DragTool::targetContainerOrRootItem(const QList<QGraphicsItem*> &itemList, FormEditorItem * currentItem) FormEditorItem *DragTool::targetContainerOrRootItem(const QList<QGraphicsItem *> &itemList, FormEditorItem *currentItem)
{ {
FormEditorItem *formEditorItem = containerFormEditorItem(itemList, {currentItem}); FormEditorItem *formEditorItem = containerFormEditorItem(itemList, {currentItem});
@@ -161,16 +133,16 @@ FormEditorItem* DragTool::targetContainerOrRootItem(const QList<QGraphicsItem*>
return formEditorItem; return formEditorItem;
} }
void DragTool::formEditorItemsChanged(const QList<FormEditorItem*> & itemList) void DragTool::formEditorItemsChanged(const QList<FormEditorItem *> &itemList)
{ {
if (m_movingItem && itemList.contains(m_movingItem)) { if (m_movingItem && itemList.contains(m_movingItem)) {
QList<FormEditorItem*> updateItemList; QList<FormEditorItem *> updateItemList;
updateItemList.append(m_movingItem); updateItemList.append(m_movingItem);
m_selectionIndicator.updateItems(updateItemList); m_selectionIndicator.updateItems(updateItemList);
} }
} }
void DragTool::instancesCompleted(const QList<FormEditorItem*> &itemList) void DragTool::instancesCompleted(const QList<FormEditorItem *> &itemList)
{ {
m_moveManipulator.synchronizeInstanceParent(itemList); m_moveManipulator.synchronizeInstanceParent(itemList);
foreach (FormEditorItem* item, itemList) foreach (FormEditorItem* item, itemList)
@@ -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()
{ {
@@ -248,7 +216,7 @@ static bool hasLibraryResources(const QMimeData *mimeData)
return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.libraryresource")); return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.libraryresource"));
} }
void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dropEvent(const QList<QGraphicsItem *> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (dragAndDropPossible(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
@@ -275,7 +243,7 @@ void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSce
} }
} }
void DragTool::dragEnterEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dragEnterEvent(const QList<QGraphicsItem *> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (dragAndDropPossible(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
m_blockMove = false; m_blockMove = false;
@@ -293,7 +261,7 @@ void DragTool::dragEnterEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphi
} }
} }
void DragTool::dragLeaveEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dragLeaveEvent(const QList<QGraphicsItem *> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (dragAndDropPossible(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
@@ -304,9 +272,9 @@ 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)
@@ -314,7 +282,7 @@ static QString libraryResourceImageName(const QMimeData *mimeData)
return QString::fromUtf8((mimeData->data(QStringLiteral("application/vnd.bauhaus.libraryresource")))); return QString::fromUtf8((mimeData->data(QStringLiteral("application/vnd.bauhaus.libraryresource"))));
} }
void DragTool::createDragNode(const QMimeData *mimeData, const QPointF &scenePosition, const QList<QGraphicsItem*> &itemList) void DragTool::createDragNode(const QMimeData *mimeData, const QPointF &scenePosition, const QList<QGraphicsItem *> &itemList)
{ {
if (!m_dragNode.hasModelNode()) { if (!m_dragNode.hasModelNode()) {
FormEditorItem *targetContainerFormEditorItem = targetContainerOrRootItem(itemList); FormEditorItem *targetContainerFormEditorItem = targetContainerOrRootItem(itemList);
@@ -334,7 +302,7 @@ void DragTool::createDragNode(const QMimeData *mimeData, const QPointF &scenePos
} }
} }
void DragTool::dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) void DragTool::dragMoveEvent(const QList<QGraphicsItem *> &itemList, QGraphicsSceneDragDropEvent *event)
{ {
if (!m_blockMove && !m_isAborted && dragAndDropPossible(event->mimeData())) { if (!m_blockMove && !m_isAborted && dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
@@ -349,7 +317,7 @@ void DragTool::dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSce
} else { } else {
createDragNode(event->mimeData(), event->scenePos(), itemList); createDragNode(event->mimeData(), event->scenePos(), itemList);
} }
} else{ } else {
event->ignore(); event->ignore();
} }
} }
@@ -366,7 +334,7 @@ void DragTool::end(Snapper::Snapping useSnapping)
clear(); clear();
} }
void DragTool::move(const QPointF &scenePosition, const QList<QGraphicsItem*> &itemList) void DragTool::move(const QPointF &scenePosition, const QList<QGraphicsItem *> &itemList)
{ {
if (m_movingItem) { if (m_movingItem) {
FormEditorItem *containerItem = targetContainerOrRootItem(itemList, m_movingItem); FormEditorItem *containerItem = targetContainerOrRootItem(itemList, m_movingItem);