diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 87eae0a7235..9a8aa127721 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -8,6 +8,7 @@ #include "qmldesignericons.h" #include "qmldesignerplugin.h" #include "assetslibrarywidget.h" +#include "commontypecache.h" #include "nameitemdelegate.h" #include "iconcheckboxitemdelegate.h" @@ -273,10 +274,9 @@ void NavigatorView::dragStarted(QMimeData *mimeData) auto assetTypeAndData = AssetsLibraryWidget::getAssetTypeAndData(assetsPaths[0]); QString assetType = assetTypeAndData.first; if (assetType == Constants::MIME_TYPE_ASSET_EFFECT) { - qint32 internalId = mimeData->data(Constants::MIME_TYPE_ASSET_EFFECT).toInt(); - ModelNode effectNode = modelNodeForInternalId(internalId); - - m_widget->setDragType(effectNode.metaInfo().typeName()); + // We use arbitrary type name because at this time we don't have effect maker + // specific type + m_widget->setDragType(Storage::Info::EffectMaker); m_widget->update(); } } diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 95d3765d9eb..ff5ca2236c3 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -2537,12 +2537,9 @@ bool NodeMetaInfo::isColor() const bool NodeMetaInfo::isEffectMaker() const { - if constexpr (useProjectStorage()) { - using namespace Storage::Info; - return isBasedOnCommonType(m_projectStorage, m_typeId); - } else { - return isValid() && m_privateData->properties().contains("layer.effect"); - } + // We use arbitrary type name because at this time we don't have effect maker + // specific type + return typeName() == QString::fromUtf8(Storage::Info::EffectMaker); } bool NodeMetaInfo::isBool() const diff --git a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h index 2d041df9cf7..36dff12dd51 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h @@ -35,6 +35,7 @@ inline constexpr char DefaultMaterial[] = "DefaultMaterial"; inline constexpr char Dialog[] = "Dialog"; inline constexpr char DoubleType[] = "double"; inline constexpr char Effect[] = "Effect"; +inline constexpr char EffectMaker[] = "EffectMaker"; inline constexpr char FloatType[] = "float"; inline constexpr char FlowActionArea[] = "FlowActionArea"; inline constexpr char FlowDecision[] = "FlowDecision";