poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/tray: rework tray image providers

Browse source
This commit is contained in:
outfoxxed 2024-04-29 22:28:09 -07:00
parent aa9f8cd001
commit 7cc1b54587
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
10 changed files with 163 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/services/status_notifier/item.cpp
View file

@ -11,12 +11,15 @@
#include <qobject.h>
#include <qpainter.h>
#include <qpixmap.h>
#include <qqmlengine.h>
#include <qrect.h>
#include <qsize.h>
#include <qstring.h>
#include <qtmetamacros.h>
#include <qtypes.h>
#include "../../core/iconimageprovider.hpp"
#include "../../core/imageprovider.hpp"
#include "../../dbus/properties.hpp"
#include "dbus_item.h"
#include "dbus_item_types.hpp"
@ -94,7 +97,7 @@ QString StatusNotifierItem::iconId() const {
return IconImageProvider::requestString(name, this->iconThemePath.get());
}
return QString("image://service.sni/") + this->watcherId + "/" + QString::number(this->iconIndex);
return this->imageHandle.url() + "/" + QString::number(this->iconIndex);
}
QPixmap StatusNotifierItem::createPixmap(const QSize& size) const {
@ -230,4 +233,22 @@ void StatusNotifierItem::onGetAllFinished() {
emit this->ready();
}
TrayImageHandle::TrayImageHandle(StatusNotifierItem* item)
: QsImageHandle(QQmlImageProviderBase::Pixmap, item)
, item(item) {}
QPixmap
TrayImageHandle::requestPixmap(const QString& /*unused*/, QSize* size, const QSize& requestedSize) {
auto targetSize = requestedSize.isValid() ? requestedSize : QSize(100, 100);
if (targetSize.width() == 0 || targetSize.height() == 0) targetSize = QSize(2, 2);
auto pixmap = this->item->createPixmap(targetSize);
if (pixmap.isNull()) {
pixmap = IconImageProvider::missingPixmap(targetSize);
}
if (size != nullptr) *size = pixmap.size();
return pixmap;
}
} // namespace qs::service::sni