mirror of
https://git.outfoxxed.me/quickshell/quickshell.git
synced 2025-11-04 19:04:56 +11:00
cdaff2967f
Fixes issues caused by the QML engine caching old pixmaps using the same IDs as new ones, notably dbusmenu icons.
93 lines
2.4 KiB
C++
93 lines
2.4 KiB
C++
#include "imageprovider.hpp"
|
|
|
|
#include <qcontainerfwd.h>
|
|
#include <qdebug.h>
|
|
#include <qimage.h>
|
|
#include <qlogging.h>
|
|
#include <qmap.h>
|
|
#include <qobject.h>
|
|
#include <qpixmap.h>
|
|
#include <qqmlengine.h>
|
|
#include <qtypes.h>
|
|
|
|
namespace {
|
|
|
|
namespace {
|
|
QMap<QString, QsImageHandle*> liveImages; // NOLINT
|
|
quint32 handleIndex = 0; // NOLINT
|
|
} // namespace
|
|
|
|
void parseReq(const QString& req, QString& target, QString& param) {
|
|
auto splitIdx = req.indexOf('/');
|
|
if (splitIdx != -1) {
|
|
target = req.sliced(0, splitIdx);
|
|
param = req.sliced(splitIdx + 1);
|
|
} else {
|
|
target = req;
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
QsImageHandle::QsImageHandle(QQmlImageProviderBase::ImageType type)
|
|
: type(type)
|
|
, id(QString::number(++handleIndex)) {
|
|
liveImages.insert(this->id, this);
|
|
}
|
|
|
|
QsImageHandle::~QsImageHandle() { liveImages.remove(this->id); }
|
|
|
|
QString QsImageHandle::url() const {
|
|
QString url = "image://";
|
|
if (this->type == QQmlImageProviderBase::Image) url += "qsimage";
|
|
else if (this->type == QQmlImageProviderBase::Pixmap) url += "qspixmap";
|
|
url += "/" + this->id;
|
|
return url;
|
|
}
|
|
|
|
QImage
|
|
QsImageHandle::requestImage(const QString& /*unused*/, QSize* /*unused*/, const QSize& /*unused*/) {
|
|
qWarning() << "Image handle" << this << "does not provide QImages";
|
|
return QImage();
|
|
}
|
|
|
|
QPixmap QsImageHandle::
|
|
requestPixmap(const QString& /*unused*/, QSize* /*unused*/, const QSize& /*unused*/) {
|
|
qWarning() << "Image handle" << this << "does not provide QPixmaps";
|
|
return QPixmap();
|
|
}
|
|
|
|
QImage QsImageProvider::requestImage(const QString& id, QSize* size, const QSize& requestedSize) {
|
|
QString target;
|
|
QString param;
|
|
parseReq(id, target, param);
|
|
|
|
auto* handle = liveImages.value(target);
|
|
if (handle != nullptr) {
|
|
return handle->requestImage(param, size, requestedSize);
|
|
} else {
|
|
qWarning() << "Requested image from unknown handle" << id;
|
|
return QImage();
|
|
}
|
|
}
|
|
|
|
QPixmap
|
|
QsPixmapProvider::requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) {
|
|
QString target;
|
|
QString param;
|
|
parseReq(id, target, param);
|
|
|
|
auto* handle = liveImages.value(target);
|
|
if (handle != nullptr) {
|
|
return handle->requestPixmap(param, size, requestedSize);
|
|
} else {
|
|
qWarning() << "Requested image from unknown handle" << id;
|
|
return QPixmap();
|
|
}
|
|
}
|
|
|
|
QString QsIndexedImageHandle::url() const {
|
|
return this->QsImageHandle::url() % '/' % QString::number(this->changeIndex);
|
|
}
|
|
|
|
void QsIndexedImageHandle::imageChanged() { ++this->changeIndex; }
|