QmlDesigner: Fix drag reset animation after drop on mac

Fixes: QDS-8933
Change-Id: Iab88c996c98e2f1eb01c0282445409411226ff95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2023-02-17 15:22:55 +02:00
parent 020db8f8e8
commit 0fb12133bb
7 changed files with 21 additions and 13 deletions

View File

@@ -54,7 +54,8 @@ Item {
root.updateDropExtFiles(drag)
}
onDropped: {
onDropped: (drag) => {
drag.accept()
rootView.handleExtFilesDrop(root.dropSimpleExtFiles,
root.dropComplexExtFiles,
assetsModel.rootPath())
@@ -198,7 +199,8 @@ Item {
root.updateDropExtFiles(drag)
}
onDropped: {
onDropped: (drag) => {
drag.accept()
rootView.emitExtFilesDrop(root.dropSimpleExtFiles, root.dropComplexExtFiles)
}

View File

@@ -344,6 +344,7 @@ TreeView {
let [row, item] = dropArea.__rowAndItem(drag)
if (item) {
drag.accept()
root.endDropHover(row)
let dirPath = item.getDirPath()

View File

@@ -503,7 +503,8 @@ Item {
materialsSection.highlight = false
}
onDrop: {
onDrop: (drag) => {
drag.accept()
materialsSection.highlight = false
rootView.acceptBundleMaterialDrop()
}
@@ -587,7 +588,8 @@ Item {
highlight = false
}
onDrop: {
onDrop: (drag) => {
drag.accept()
highlight = false
rootView.acceptBundleTextureDrop()
}

View File

@@ -51,6 +51,7 @@ Rectangle {
}
onDropped: (drag) => {
drag.accept()
rootView.acceptTextureDropOnMaterial(index, drag.getDataAsString(drag.keys[0]))
}
}

View File

@@ -69,7 +69,8 @@ StudioControls.ComboBox {
onExited: comboBox.hasActiveHoverDrag = false
onDropped: {
onDropped: (drag) => {
drag.accept()
comboBox.backendValue.commitDrop(dropArea.dropData)
comboBox.hasActiveHoverDrag = false
}

View File

@@ -636,7 +636,7 @@ bool NavigatorTreeModel::dropMimeData(const QMimeData *mimeData,
}
}
return false; // don't let the view do drag&drop on its own
return true;
}
void NavigatorTreeModel::handleInternalDrop(const QMimeData *mimeData,

View File

@@ -210,6 +210,7 @@ void NavigatorWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent)
void NavigatorWidget::dropEvent(QDropEvent *dropEvent)
{
dropEvent->accept();
const DesignerActionManager &actionManager = QmlDesignerPlugin::instance()
->viewManager().designerActionManager();
actionManager.handleExternalAssetsDrop(dropEvent->mimeData());