fix: sni tray icon size in hihdpi

Change-Id: I7ad1fe8c974fe9221ba6ada2a6487377e8f372a5
This commit is contained in:
listenerri 2018-12-05 17:18:25 +08:00
parent 717b30bcec
commit 74cd9594f9
Notes: gerrit 2018-12-06 13:11:21 +08:00
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Thu, 06 Dec 2018 13:11:21 +0800
Reviewed-on: https://cr.deepin.io/40305
Project: dde/dde-dock
Branch: refs/heads/master

View File

@ -275,15 +275,17 @@ QPixmap SNITrayWidget::newIconPixmap(IconType iconType)
break;
}
const auto ratio = qApp->devicePixelRatio();
const int iconSize = IconSize * ratio;
do {
if (!iconName.isEmpty()) {
pixmap = ThemeAppIcon::getIcon(iconName, IconSize);
pixmap = ThemeAppIcon::getIcon(iconName, iconSize);
if (!pixmap.isNull()) {
break;
}
}
const auto ratio = qApp->devicePixelRatio();
if (!dbusImageList.isEmpty()) {
for (DBusImage dbusImage : dbusImageList) {
char *image_data = dbusImage.pixels.data();
@ -295,7 +297,7 @@ QPixmap SNITrayWidget::newIconPixmap(IconType iconType)
}
QImage image((const uchar*)dbusImage.pixels.constData(), dbusImage.width, dbusImage.height, QImage::Format_ARGB32);
pixmap = QPixmap::fromImage(image.scaled(IconSize, IconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation));
pixmap = QPixmap::fromImage(image.scaled(iconSize, iconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation));
pixmap.setDevicePixelRatio(ratio);
if (!pixmap.isNull()) {
break;