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

plugin: better getDominantColour

Browse source 
Use callback instead of setting prop
This commit is contained in:
2 * r + 2 * t 2025-08-27 23:29:11 +10:00
parent 51bcacded4
commit bec98e1fc5
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/effects/ColouredIcon.qml
View file

@ -19,12 +19,12 @@ IconImage {
}
layer.onEnabledChanged: {
if (layer.enabled)
CUtils.getDominantColour(this);
if (layer.enabled && status === Image.Ready)
CUtils.getDominantColour(this, c => dominantColour = c);
}
onStatusChanged: {
if (layer.enabled && status === Image.Ready)
CUtils.getDominantColour(this);
CUtils.getDominantColour(this, c => dominantColour = c);
}
}

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

@ -91,11 +91,11 @@ bool CUtils::copyFile(const QUrl& source, const QUrl& target, bool overwrite) co
return QFile::copy(source.toLocalFile(), target.toLocalFile());
}
void CUtils::getDominantColour(QQuickItem* item) const {
this->getDominantColour(item, 128, 128);
void CUtils::getDominantColour(QQuickItem* item, QJSValue callback) const {
this->getDominantColour(item, 128, 128, callback);
}
void CUtils::getDominantColour(QQuickItem* item, int width, int height) const {
void CUtils::getDominantColour(QQuickItem* item, int width, int height, QJSValue callback) const {
if (!item) {
qWarning() << "CUtils::getDominantColour: an item is required";
return;
@ -109,7 +109,7 @@ void CUtils::getDominantColour(QQuickItem* item, int width, int height) const {
QSharedPointer<QQuickItemGrabResult> grabResult = item->grabToImage(QSize(width, height));
QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this,
[grabResult, item, this]() {
[grabResult, item, callback, this]() {
QImage image = grabResult->image();
if (image.format() != QImage::Format_ARGB32) {
@ -154,10 +154,11 @@ void CUtils::getDominantColour(QQuickItem* item, int width, int height) const {
}
const QColor colour = QColor((0xFF << 24) | dominantColour);
QMetaObject::invokeMethod(item, [item, colour]() {
item->setProperty("dominantColour", colour);
}, Qt::QueuedConnection);
if (callback.isCallable()) {
QMetaObject::invokeMethod(item, [item, callback, colour, this]() {
callback.call({ qmlEngine(this)->toScriptValue(QVariant::fromValue(colour)) });
}, Qt::QueuedConnection);
}
}
);
}

4
plugin/src/Caelestia/cutils.hpp
View file

@ -20,6 +20,6 @@ public:
Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target) const;
Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite) const;
Q_INVOKABLE void getDominantColour(QQuickItem* item) const;
Q_INVOKABLE void getDominantColour(QQuickItem* item, int width, int height) const;
Q_INVOKABLE void getDominantColour(QQuickItem* item, QJSValue callback) const;
Q_INVOKABLE void getDominantColour(QQuickItem* item, int width, int height, QJSValue callback) const;
};