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

Fix gray scale images breaking notifications on dunst

Browse source 
Fixes #907
This commit is contained in:
Nicolas Werner 2022-01-26 21:42:20 +01:00
parent 34f049cc35
commit 9a2e07cbce
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/notifications/ManagerLinux.cpp
View file

@ -289,33 +289,17 @@ operator<<(QDBusArgument &arg, const QImage &image)
return arg; return arg;
} }
QImage scaled = image.scaledToHeight(100, Qt::SmoothTransformation); QImage i = image.height() > 100 || image.width() > 100
scaled = scaled.convertToFormat(QImage::Format_ARGB32); ? image.scaledToHeight(100, Qt::SmoothTransformation)
: image;
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN i = std::move(i).convertToFormat(QImage::Format_RGBA8888);
// ABGR -> ARGB
QImage i = scaled.rgbSwapped();
#else
// ABGR -> GBAR
QImage i(scaled.size(), scaled.format());
for (int y = 0; y < i.height(); ++y) {
QRgb *p = (QRgb *)scaled.scanLine(y);
QRgb *q = (QRgb *)i.scanLine(y);
QRgb *end = p + scaled.width();
while (p < end) {
*q = qRgba(qGreen(*p), qBlue(*p), qAlpha(*p), qRed(*p));
p++;
q++;
}
}
#endif
arg.beginStructure(); arg.beginStructure();
arg << i.width(); arg << i.width();
arg << i.height(); arg << i.height();
arg << i.bytesPerLine(); arg << i.bytesPerLine();
arg << i.hasAlphaChannel(); arg << i.hasAlphaChannel();
int channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3); int channels = i.hasAlphaChannel() ? 4 : 3;
arg << i.depth() / channels; arg << i.depth() / channels;
arg << channels; arg << channels;
arg << QByteArray(reinterpret_cast<const char *>(i.bits()), i.sizeInBytes()); arg << QByteArray(reinterpret_cast<const char *>(i.bits()), i.sizeInBytes());