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

Fixes #50.

Browse source 
On KDE desktop icon failed to appear because TrayIcon requested a zero-size rect. Implementing MsgCountComposedIcon::availableSizes() method fixes that.

After icon became visible it was not transparent, and places that should have been transparent contained artifacts likely due to uninitialized memory. Implementing MsgCountComposedIcon::pixmap() which returns a pixmap with alpha channel fixes that.
This commit is contained in:
Rokas Kupstys 2017-10-01 12:13:10 +03:00
parent 775d2e88f5
commit da6e7c11dc
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/TrayIcon.h
View file

@ -32,6 +32,8 @@ public:
virtual void paint(QPainter *p, const QRect &rect, QIcon::Mode mode, QIcon::State state); virtual void paint(QPainter *p, const QRect &rect, QIcon::Mode mode, QIcon::State state);
virtual QIconEngine *clone() const; virtual QIconEngine *clone() const;
virtual QList<QSize> availableSizes(QIcon::Mode mode, QIcon::State state) const;
virtual QPixmap pixmap(const QSize& size, QIcon::Mode mode, QIcon::State state);
int msgCount = 0; int msgCount = 0;

29
src/TrayIcon.cc
View file

@ -17,6 +17,7 @@
#include <QApplication> #include <QApplication>
#include <QTimer> #include <QTimer>
#include <QList>
#include "TrayIcon.h" #include "TrayIcon.h"
@ -72,6 +73,34 @@ MsgCountComposedIcon::clone() const
return new MsgCountComposedIcon(*this); return new MsgCountComposedIcon(*this);
} }
QList<QSize>
MsgCountComposedIcon::availableSizes(QIcon::Mode mode, QIcon::State state) const
{
Q_UNUSED(mode);
Q_UNUSED(state);
QList<QSize> sizes;
sizes.append(QSize(24, 24));
sizes.append(QSize(32, 32));
sizes.append(QSize(48, 48));
sizes.append(QSize(64, 64));
sizes.append(QSize(128, 128));
sizes.append(QSize(256, 256));
return sizes;
}
QPixmap
MsgCountComposedIcon::pixmap(const QSize& size, QIcon::Mode mode, QIcon::State state)
{
QImage img(size, QImage::Format_ARGB32);
img.fill(qRgba(0, 0, 0, 0));
QPixmap result = QPixmap::fromImage(img, Qt::NoFormatConversion);
{
QPainter painter(&result);
paint(&painter, QRect(QPoint(0, 0), size), mode, state);
}
return result;
}
TrayIcon::TrayIcon(const QString &filename, QWidget *parent) TrayIcon::TrayIcon(const QString &filename, QWidget *parent)
: QSystemTrayIcon(parent) : QSystemTrayIcon(parent)
{ {