nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: use original image if requested size is invalid

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-27 20:56:35 +10:00
parent 1f7aeec8c4
commit b4d490a9bc
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plugin/src/Caelestia/Images/cachingimageprovider.cpp
View file

@ -85,17 +85,12 @@ private:
return; return;
} }
// Get size from requested size, or the source's original size // Use original image if requested size is invalid
QSize size = m_requestedSize; if (m_requestedSize.width() <= 0 || m_requestedSize.height() <= 0) {
if (size.width() <= 0 || size.height() <= 0) { m_image = QImage(path);
const QImageReader reader(path); qCDebug(lcCProv) << "Given source size is invalid, not caching.";
size = reader.size();
if (!size.isValid() || size.isEmpty()) {
m_error = QStringLiteral("Could not determine size for: ") + path;
qCWarning(lcCProv).noquote() << m_error;
return; return;
} }
}
const QString sha = sha256sum(path); const QString sha = sha256sum(path);
if (sha.isEmpty()) { if (sha.isEmpty()) {
@ -105,7 +100,7 @@ private:
// clang-format off // clang-format off
const QString filename = QStringLiteral("%1@%2x%3-%4.png") const QString filename = QStringLiteral("%1@%2x%3-%4.png")
.arg(sha).arg(size.width()).arg(size.height()).arg(fillSuffix(m_fillMode)); .arg(sha).arg(m_requestedSize.width()).arg(m_requestedSize.height()).arg(fillSuffix(m_fillMode));
// clang-format on // clang-format on
const QString cache = cacheDir() + QLatin1Char('/') + filename; const QString cache = cacheDir() + QLatin1Char('/') + filename;
@ -129,13 +124,13 @@ private:
// Scale to requested size // Scale to requested size
switch (m_fillMode) { switch (m_fillMode) {
case CachingImageProvider::FillMode::Crop: case CachingImageProvider::FillMode::Crop:
image = image.scaled(size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); image = image.scaled(m_requestedSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
break; break;
case CachingImageProvider::FillMode::Fit: case CachingImageProvider::FillMode::Fit:
image = image.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation); image = image.scaled(m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
break; break;
case CachingImageProvider::FillMode::Stretch: case CachingImageProvider::FillMode::Stretch:
image = image.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); image = image.scaled(m_requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
break; break;
} }
@ -143,11 +138,12 @@ private:
m_image = image; m_image = image;
} else { } else {
// Crop or fit // Crop or fit
QImage canvas(size, QImage::Format_ARGB32); QImage canvas(m_requestedSize, QImage::Format_ARGB32);
canvas.fill(Qt::transparent); canvas.fill(Qt::transparent);
QPainter painter(&canvas); QPainter painter(&canvas);
painter.drawImage((size.width() - image.width()) / 2, (size.height() - image.height()) / 2, image); painter.drawImage(
(m_requestedSize.width() - image.width()) / 2, (m_requestedSize.height() - image.height()) / 2, image);
painter.end(); painter.end();
m_image = canvas; m_image = canvas;