d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix notification images

Browse source
This commit is contained in:
Nicolas Werner 2023-06-08 00:32:02 +02:00
parent 04cbbd2837
commit f145c2a41a
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/dbus/NhekoDBusApi.cpp
View file

@ -190,20 +190,17 @@ operator<<(QDBusArgument &arg, const QImage &image)
return arg; return arg;
} }
QImage i = image.height() > 100 || image.width() > 100 QImage i = image.height() > 100 || image.width() > 100
? image.scaledToHeight(100, Qt::SmoothTransformation) ? image.scaledToHeight(100, Qt::SmoothTransformation)
: image; : image;
i = std::move(i).convertToFormat(QImage::Format_RGBA8888); bool hasAlpha = i.hasAlphaChannel();
i = std::move(i).convertToFormat(hasAlpha ? QImage::Format_RGBA8888 : QImage::Format_RGB888);
int channels = hasAlpha ? 4 : 3;
QByteArray arr(reinterpret_cast<const char *>(i.bits()), static_cast<int>(i.sizeInBytes()));
arg.beginStructure(); arg.beginStructure();
arg << i.width(); arg << i.width() << i.height() << (int)i.bytesPerLine() << i.hasAlphaChannel()
arg << i.height(); << i.depth() / channels << channels << arr;
arg << i.bytesPerLine();
arg << i.hasAlphaChannel();
int channels = i.hasAlphaChannel() ? 4 : 3;
arg << i.depth() / channels;
arg << channels;
arg << QByteArray(reinterpret_cast<const char *>(i.bits()), static_cast<int>(i.sizeInBytes()));
arg.endStructure(); arg.endStructure();
return arg; return arg;

7
src/notifications/Manager.h
View file

@ -111,10 +111,3 @@ private:
// Only populated on Linux atm // Only populated on Linux atm
QMap<uint, roomEventId> notificationIds; QMap<uint, roomEventId> notificationIds;
}; };
#if defined(NHEKO_DBUS_SYS)
QDBusArgument &
operator<<(QDBusArgument &arg, const QImage &image);
const QDBusArgument &
operator>>(const QDBusArgument &arg, QImage &);
#endif