AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

D-Bus tray icons: get devicePixelRatio at runtime

Browse Source 
In static builds of Qt, static initialization may not work because
we need an initialized list of screens before devicePixelRatio() can
use them to find the value.  Anyway, it's better to know the dpr
at the time the tray icon will be shown rather than when the
application is started, just in case it changes.

Change-Id: Iedffb674d8e8818c2a4e64d7c7a3c89a2dca77f3
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Shawn Rutledge 2015-02-04 10:58:06 +01:00
parent 1f4b84f69f
commit 315145ac95
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static const int IconSizeLimit = 64 * qGuiApp->devicePixelRatio(); static const int IconSizeLimit = 64;
static const int IconNormalSmallSize = 22 * qGuiApp->devicePixelRatio(); static const int IconNormalSmallSize = 22;
static const int IconNormalMediumSize = 64 * qGuiApp->devicePixelRatio(); static const int IconNormalMediumSize = 64;
QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon) QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
{ {
@ -65,22 +65,23 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
// and ensure that something between 22px and 64px exists, for better scaling to other sizes. // and ensure that something between 22px and 64px exists, for better scaling to other sizes.
bool hasSmallIcon = false; bool hasSmallIcon = false;
bool hasMediumIcon = false; bool hasMediumIcon = false;
qreal dpr = qGuiApp->devicePixelRatio();
QList<QSize> toRemove; QList<QSize> toRemove;
Q_FOREACH (const QSize &size, sizes) { Q_FOREACH (const QSize &size, sizes) {
int maxSize = qMax(size.width(), size.height()); int maxSize = qMax(size.width(), size.height());
if (maxSize <= IconNormalSmallSize) if (maxSize <= IconNormalSmallSize * dpr)
hasSmallIcon = true; hasSmallIcon = true;
else if (maxSize <= IconNormalMediumSize) else if (maxSize <= IconNormalMediumSize * dpr)
hasMediumIcon = true; hasMediumIcon = true;
else if (maxSize > IconSizeLimit) else if (maxSize > IconSizeLimit * dpr)
toRemove << size; toRemove << size;
} }
Q_FOREACH (const QSize &size, toRemove) Q_FOREACH (const QSize &size, toRemove)
sizes.removeOne(size); sizes.removeOne(size);
if (!hasSmallIcon) if (!hasSmallIcon)
sizes.append(QSize(IconNormalSmallSize, IconNormalSmallSize)); sizes.append(QSize(IconNormalSmallSize * dpr, IconNormalSmallSize * dpr));
if (!hasMediumIcon) if (!hasMediumIcon)
sizes.append(QSize(IconNormalMediumSize, IconNormalMediumSize)); sizes.append(QSize(IconNormalMediumSize * dpr, IconNormalMediumSize * dpr));
foreach (QSize size, sizes) { foreach (QSize size, sizes) {
// Protocol specifies ARGB32 format in network byte order // Protocol specifies ARGB32 format in network byte order
QImage im = icon.pixmap(size).toImage().convertToFormat(QImage::Format_ARGB32); QImage im = icon.pixmap(size).toImage().convertToFormat(QImage::Format_ARGB32);