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

plugin: fix getDominantColour scaling

Browse source
This commit is contained in:
2 * r + 2 * t 2025-08-27 23:36:54 +10:00
parent bec98e1fc5
commit a1d5a16392
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugin/src/Caelestia/cutils.cpp
View file

@ -95,7 +95,7 @@ void CUtils::getDominantColour(QQuickItem* item, QJSValue callback) const {
this->getDominantColour(item, 128, 128, callback); this->getDominantColour(item, 128, 128, callback);
} }
void CUtils::getDominantColour(QQuickItem* item, int width, int height, QJSValue callback) const { void CUtils::getDominantColour(QQuickItem* item, int targetWidth, int targetHeight, QJSValue callback) const {
if (!item) { if (!item) {
qWarning() << "CUtils::getDominantColour: an item is required"; qWarning() << "CUtils::getDominantColour: an item is required";
return; return;
@ -106,12 +106,20 @@ void CUtils::getDominantColour(QQuickItem* item, int width, int height, QJSValue
return; return;
} }
QSharedPointer<QQuickItemGrabResult> grabResult = item->grabToImage(QSize(width, height)); QSharedPointer<QQuickItemGrabResult> grabResult = item->grabToImage();
QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this, QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this,
[grabResult, item, callback, this]() { [grabResult, item, targetWidth, targetHeight, callback, this]() {
QImage image = grabResult->image(); QImage image = grabResult->image();
if (image.width() > targetWidth && image.height() > targetHeight) {
image = image.scaled(targetWidth, targetHeight);
} else if (image.width() > targetWidth) {
image = image.scaledToWidth(targetWidth);
} else if (image.height() > targetHeight) {
image = image.scaledToHeight(targetHeight);
}
if (image.format() != QImage::Format_ARGB32) { if (image.format() != QImage::Format_ARGB32) {
image = image.convertToFormat(QImage::Format_ARGB32); image = image.convertToFormat(QImage::Format_ARGB32);
} }