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

feat: calculate size from source when single dim requested

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-27 22:07:11 +10:00
parent 775d0a8101
commit 665d784186
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,8 +47,12 @@ private:
return; return;
} }
// Use original image if requested size is invalid QSize size = m_requestedSize;
if (m_requestedSize.width() <= 0 || m_requestedSize.height() <= 0) { const bool needsW = size.width() <= 0;
const bool needsH = size.height() <= 0;
// If both dimensions are missing, return the original directly
if (needsW && needsH) {
qCDebug(lcCProv).noquote() << "Given source size is invalid, returning original:" << path; qCDebug(lcCProv).noquote() << "Given source size is invalid, returning original:" << path;
m_image = QImage(path); m_image = QImage(path);
if (m_image.isNull()) { if (m_image.isNull()) {
@ -58,8 +62,24 @@ private:
return; return;
} }
// If one dimension is missing, derive it from the source aspect ratio
if (needsW || needsH) {
const QImageReader sourceReader(path);
const QSize sourceSize = sourceReader.size();
if (!sourceSize.isValid() || sourceSize.isEmpty()) {
m_error = QStringLiteral("Could not determine source size for: ") + path;
qCWarning(lcCProv).noquote() << m_error;
return;
}
if (needsW)
size.setWidth(qRound(size.height() * sourceSize.width() / static_cast<qreal>(sourceSize.height())));
else
size.setHeight(qRound(size.width() * sourceSize.height() / static_cast<qreal>(sourceSize.width())));
}
// Try to use cached image // Try to use cached image
const auto cachePath = ImageCacher::cachePathFor(path, m_requestedSize, m_fillMode); const auto cachePath = ImageCacher::cachePathFor(path, size, m_fillMode);
if (!cachePath.isEmpty()) { if (!cachePath.isEmpty()) {
QImageReader cacheReader(cachePath); QImageReader cacheReader(cachePath);
if (cacheReader.canRead()) { if (cacheReader.canRead()) {
@ -70,7 +90,7 @@ private:
} }
// Schedule cache job (this call will return the original image, but later ones will use cache) // Schedule cache job (this call will return the original image, but later ones will use cache)
ImageCacher::instance()->schedule(path, cachePath, m_requestedSize, m_fillMode); ImageCacher::instance()->schedule(path, cachePath, size, m_fillMode);
m_image = QImage(path); m_image = QImage(path);
if (m_image.isNull()) { if (m_image.isNull()) {