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

QmlDesigner: Fix textures added as image or dragged using the icons

Browse Source 
Instead of using the paths to the real, downloaded textures, the paths
of the icons (thumbnails) were being used.

(cherry picked from commit e831c9e713)
Task-number: QDS-9228
Change-Id: I828b765c4f86502403b84fdf18532d1353d3a62c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
This commit is contained in:
Samuel Ghinet
2023-02-21 14:04:33 +02:00
committed by Thomas Hartmann
parent c461addadc
commit f6155937a0
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.cpp
View File

@@ -39,7 +39,7 @@ QUrl ContentLibraryTexture::icon() const
return m_icon; return m_icon;
} }
QString ContentLibraryTexture::path() const QString ContentLibraryTexture::iconPath() const
{ {
return m_iconPath; return m_iconPath;
} }
@@ -86,10 +86,15 @@ bool ContentLibraryTexture::isDownloaded() const
if (m_fileExt.isEmpty()) if (m_fileExt.isEmpty())
return false; return false;
QString fullPath = m_downloadPath + "/" + m_baseName + m_fileExt; QString fullPath = realTexturePath();
return QFileInfo(fullPath).isFile(); return QFileInfo(fullPath).isFile();
} }
QString ContentLibraryTexture::realTexturePath() const
{
return m_downloadPath + "/" + m_baseName + m_fileExt;
}
void ContentLibraryTexture::setDownloaded() void ContentLibraryTexture::setDownloaded()
{ {
m_fileExt = resolveFileExt(); m_fileExt = resolveFileExt();

3
src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexture.h
View File

@@ -30,7 +30,8 @@ public:
bool filter(const QString &searchText); bool filter(const QString &searchText);
QUrl icon() const; QUrl icon() const;
QString path() const; QString iconPath() const;
QString realTexturePath() const;
QString parentDirPath() const; QString parentDirPath() const;
signals: signals:

22
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
View File

@@ -65,12 +65,13 @@ bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
} }
} else if (m_textureToDrag) { } else if (m_textureToDrag) {
QMouseEvent *me = static_cast<QMouseEvent *>(event); QMouseEvent *me = static_cast<QMouseEvent *>(event);
if ((me->globalPos() - m_dragStartPoint).manhattanLength() > 20) { if ((me->globalPos() - m_dragStartPoint).manhattanLength() > 20
&& m_textureToDrag->isDownloaded()) {
QMimeData *mimeData = new QMimeData; QMimeData *mimeData = new QMimeData;
mimeData->setData(Constants::MIME_TYPE_BUNDLE_TEXTURE, {m_textureToDrag->path().toUtf8()}); mimeData->setData(Constants::MIME_TYPE_BUNDLE_TEXTURE, {m_textureToDrag->iconPath().toUtf8()});
// Allows standard file drag-n-drop. As of now needed to drop on Assets view // Allows standard file drag-n-drop. As of now needed to drop on Assets view
mimeData->setUrls({QUrl::fromLocalFile(m_textureToDrag->path())}); mimeData->setUrls({QUrl::fromLocalFile(m_textureToDrag->realTexturePath())});
emit bundleTextureDragStarted(m_textureToDrag); emit bundleTextureDragStarted(m_textureToDrag);
model->startDrag(mimeData, m_textureToDrag->icon().toLocalFile()); model->startDrag(mimeData, m_textureToDrag->icon().toLocalFile());
@@ -261,17 +262,26 @@ void ContentLibraryWidget::startDragTexture(QmlDesigner::ContentLibraryTexture *
void ContentLibraryWidget::addImage(ContentLibraryTexture *tex) void ContentLibraryWidget::addImage(ContentLibraryTexture *tex)
{ {
emit addTextureRequested(tex->path(), AddTextureMode::Image); if (!tex->isDownloaded())
return;
emit addTextureRequested(tex->realTexturePath(), AddTextureMode::Image);
} }
void ContentLibraryWidget::addTexture(ContentLibraryTexture *tex) void ContentLibraryWidget::addTexture(ContentLibraryTexture *tex)
{ {
emit addTextureRequested(tex->path(), AddTextureMode::Texture); if (!tex->isDownloaded())
return;
emit addTextureRequested(tex->realTexturePath(), AddTextureMode::Texture);
} }
void ContentLibraryWidget::addLightProbe(ContentLibraryTexture *tex) void ContentLibraryWidget::addLightProbe(ContentLibraryTexture *tex)
{ {
emit addTextureRequested(tex->path(), AddTextureMode::LightProbe); if (!tex->isDownloaded())
return;
emit addTextureRequested(tex->realTexturePath(), AddTextureMode::LightProbe);
} }
void ContentLibraryWidget::updateSceneEnvState() void ContentLibraryWidget::updateSceneEnvState()