whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

D-Bus tray icon: when eliminating large icons, scale to medium size 

22px is not always large enough: KDE5 seems to like to make icons up to
28px, and they could be even larger on high-DPI screens.

Change-Id: Ifa8e0d49b310e4b4304207596f0f32c36a5db6a7
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
bb10
Shawn Rutledge 2015-01-19 16:00:21 +01:00
parent e910c36a3f
commit 5facb0ce90
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/platformsupport/dbustray/qdbustraytypes.cpp
View File

@ -45,27 +45,33 @@
#include <QDebug>
#include <QtEndian>
#include <QPainter>
#include <QGuiApplication>
#include <qpa/qplatformmenu.h>
#include "qdbusplatformmenu_p.h"
QT_BEGIN_NAMESPACE
static const int IconSizeLimit = 32;
static const int IconNormalSmallSize = 22;
static const int IconSizeLimit = 64 * qGuiApp->devicePixelRatio();
static const int IconNormalSmallSize = 22 * qGuiApp->devicePixelRatio();
static const int IconNormalMediumSize = 64 * qGuiApp->devicePixelRatio();
QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
{
QXdgDBusImageVector ret;
QList<QSize> sizes = icon.availableSizes();
// Omit any size larger than 32 px, to save D-Bus bandwidth;
// and ensure that 22px or smaller exists, because it's a common size.
// Omit any size larger than 64 px, to save D-Bus bandwidth;
// ensure that 22px or smaller exists, because it's a common size;
// and ensure that something between 22px and 64px exists, for better scaling to other sizes.
bool hasSmallIcon = false;
bool hasMediumIcon = false;
QList<QSize> toRemove;
Q_FOREACH (const QSize &size, sizes) {
int maxSize = qMax(size.width(), size.height());
if (maxSize <= IconNormalSmallSize)
hasSmallIcon = true;
else if (maxSize <= IconNormalMediumSize)
hasMediumIcon = true;
else if (maxSize > IconSizeLimit)
toRemove << size;
}
@ -73,7 +79,8 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
sizes.removeOne(size);
if (!hasSmallIcon)
sizes.append(QSize(IconNormalSmallSize, IconNormalSmallSize));
if (!hasMediumIcon)
sizes.append(QSize(IconNormalMediumSize, IconNormalMediumSize));
foreach (QSize size, sizes) {
// Protocol specifies ARGB32 format in network byte order
QImage im = icon.pixmap(size).toImage().convertToFormat(QImage::Format_ARGB32);