Skip to content

Editor: Wrong files in Content Browser #1118 #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Sep 24, 2025
Merged

Editor: Wrong files in Content Browser #1118 #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions worldeditor/src/screens/contentbrowser/contenttree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ QVariant ContentTree::data(const QModelIndex &index, int role) const {
case Qt::DisplayRole: {
switch(index.column()) {
case 1: return info.isDir();
case 2: return item->property(qPrintable(gType));
case 2: return item->property(gType);
default: return info.baseName();
}
}
case Qt::DecorationRole: {
return item->property(qPrintable(gIcon)).value<QImage>();
return item->property(gIcon).value<QImage>();
}
default: break;
}
Expand Down Expand Up @@ -122,12 +122,12 @@ void ContentTree::onRendered(const TString &uuid) {

QObject *item(m_rootItem->findChild<QObject *>(source));
if(item) {
item->setProperty(qPrintable(gType), asset->assetTypeName(info.absoluteFilePath().toStdString()).data());
item->setProperty(gType, asset->assetTypeName(info.absoluteFilePath().toStdString()).data());

QImage img = asset->icon(info.absoluteFilePath().toStdString());
if(!img.isNull()) {
item->setProperty(qPrintable(gIcon), (img.height() < img.width()) ? img.scaledToWidth(m_folder.width()) :
img.scaledToHeight(m_folder.height()));
item->setProperty(gIcon, (img.height() < img.width()) ? img.scaledToWidth(m_folder.width()) :
img.scaledToHeight(m_folder.height()));
}

emit layoutAboutToBeChanged();
Expand Down Expand Up @@ -175,11 +175,11 @@ QModelIndex ContentTree::setNewAsset(const QString &name, const QString &source,

m_newAsset->setParent(parent);
m_newAsset->setObjectName(dir.relativeFilePath(info.filePath()));
m_newAsset->setProperty(qPrintable(gImport), source);
m_newAsset->setProperty(gImport, source);

AssetConverterSettings *settings = AssetManager::instance()->fetchSettings(source.toStdString());
if(settings) {
m_newAsset->setProperty(qPrintable(gIcon), (directory) ? m_folder : settings->icon(settings->destination()));
m_newAsset->setProperty(gIcon, (directory) ? m_folder : settings->icon(settings->destination()));
}
} else {
m_newAsset->setParent(nullptr);
Expand All @@ -191,8 +191,9 @@ QModelIndex ContentTree::setNewAsset(const QString &name, const QString &source,
return getIndex(m_newAsset);
}

void ContentTree::update(const QString &path) {
QDir dir(ProjectSettings::instance()->contentPath().data());
void ContentTree::update() {
QString path(ProjectSettings::instance()->contentPath().data());
QDir dir(path);

QObject *parent = m_rootItem->findChild<QObject *>(dir.relativeFilePath(path));
if(parent == nullptr) {
Expand Down Expand Up @@ -220,10 +221,10 @@ void ContentTree::update(const QString &path) {
QObject *item = new QObject(parent);
item->setObjectName(source);
if(!info.isDir()) {
item->setProperty(qPrintable(gType), asset->assetTypeName(info.absoluteFilePath().toStdString()).data());
item->setProperty(qPrintable(gIcon), asset->icon(info.absoluteFilePath().toStdString()));
item->setProperty(gType, asset->assetTypeName(info.absoluteFilePath().toStdString()).data());
item->setProperty(gIcon, asset->icon(info.absoluteFilePath().toStdString()));
} else {
item->setProperty(qPrintable(gIcon), m_folder);
item->setProperty(gIcon, m_folder);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion worldeditor/src/screens/contentbrowser/contenttree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ContentTree : public BaseObjectModel {
public slots:
void onRendered(const TString &uuid);

void update(const QString &path);
void update();

void clean(QObject *parent);

Expand Down
Loading