CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks

Browse Source
This commit is contained in:
Trial97 2023-07-03 09:01:22 +03:00
commit ba159ba971
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
launcher/ui/pages/instance/ScreenshotsPage.cpp
View File

@ -97,17 +97,13 @@ public:
return; return;
if ((info.suffix().compare("png", Qt::CaseInsensitive) != 0)) if ((info.suffix().compare("png", Qt::CaseInsensitive) != 0))
return; return;
int tries = 5;
while (tries)
{
if (!m_cache->stale(m_path)) if (!m_cache->stale(m_path))
return; return;
QImage image(m_path); QImage image(m_path);
if (image.isNull()) if (image.isNull()) {
{ m_resultEmitter.emitResultsFailed(m_path);
QThread::msleep(500); qDebug() << "Error loading screenshot: " + m_path + ". Perhaps too large?";
tries--; return;
continue;
} }
QImage small; QImage small;
if (image.width() > image.height()) if (image.width() > image.height())
@ -125,9 +121,6 @@ public:
QIcon icon(QPixmap::fromImage(square)); QIcon icon(QPixmap::fromImage(square));
m_cache->add(m_path, icon); m_cache->add(m_path, icon);
m_resultEmitter.emitResultsReady(m_path); m_resultEmitter.emitResultsReady(m_path);
return;
}
m_resultEmitter.emitResultsFailed(m_path);
} }
QString m_path; QString m_path;
SharedIconCachePtr m_cache; SharedIconCachePtr m_cache;
@ -146,9 +139,12 @@ public:
m_thumbnailCache = std::make_shared<SharedIconCache>(); m_thumbnailCache = std::make_shared<SharedIconCache>();
m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder")); m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder"));
connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString))); connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
// FIXME: the watched file set is not updated when files are removed
} }
virtual ~FilterModel() { m_thumbnailingPool.waitForDone(500); } virtual ~FilterModel() {
m_thumbnailingPool.clear();
if (!m_thumbnailingPool.waitForDone(500))
qDebug() << "Thumbnail pool took longer than 500ms to finish";
}
virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const
{ {
auto model = sourceModel(); auto model = sourceModel();
@ -215,10 +211,12 @@ private slots:
void fileChanged(QString filepath) void fileChanged(QString filepath)
{ {
m_thumbnailCache->setStale(filepath); m_thumbnailCache->setStale(filepath);
thumbnailImage(filepath);
// reinsert the path... // reinsert the path...
watcher.removePath(filepath); watcher.removePath(filepath);
if (QFile::exists(filepath)) {
watcher.addPath(filepath); watcher.addPath(filepath);
thumbnailImage(filepath);
}
} }
private: private: