Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复高缩放率下固定区域图标和回收站图标显示异常的问题

Browse Source 
图标加载后，需要将图标缩放成合适的大小

Log: 修复高缩放率下图标显示异常
Influence: 1.25倍缩放率下，选择非默认主题，观察任务栏显示桌面、多任务试图和回收站的图标大小是否正常
Bug: https://pms.uniontech.com/bug-view-182673.html
Change-Id: I8d02cec5f990523acb9f75763fa1cb1e24c93e9c
This commit is contained in:
donghualin 2023-01-13 09:41:11 +08:00
parent 4ed9b915f9
commit ebd1522aea
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frame/util/imageutil.cpp
View File

@ -47,7 +47,9 @@ const QPixmap ImageUtil::loadSvg(const QString &iconName, const QString &localPa
if (!icon.isNull()) {
QPixmap pixmap = icon.pixmap(pixmapSize);
pixmap.setDevicePixelRatio(ratio);
return pixmap;
if (ratio == 1)
return pixmap;
return pixmap.scaled(size * ratio, size * ratio);
}
QPixmap pixmap(pixmapSize, pixmapSize);
@ -61,7 +63,10 @@ const QPixmap ImageUtil::loadSvg(const QString &iconName, const QString &localPa
painter.end();
pixmap.setDevicePixelRatio(ratio);
return pixmap;
if (ratio == 1)
return pixmap;
return pixmap.scaled(size * ratio, size * ratio);
}
const QPixmap ImageUtil::loadSvg(const QString &iconName, const QSize size, const qreal ratio)
@ -70,6 +75,14 @@ const QPixmap ImageUtil::loadSvg(const QString &iconName, const QSize size, cons
if (!icon.isNull()) {
QPixmap pixmap = icon.pixmap(QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? size : QSize(size * ratio));
pixmap.setDevicePixelRatio(ratio);
if (ratio == 1)
return pixmap;
if (pixmap.size().width() > size.width() * ratio)
pixmap = pixmap.scaledToWidth(size.width() * ratio);
if (pixmap.size().height() > size.height() * ratio)
pixmap = pixmap.scaledToHeight(size.height() * ratio);
return pixmap;
}
return QPixmap();

2
plugins/multitasking/multitaskingplugin.cpp
View File

@ -169,5 +169,5 @@ PluginsItemInterface::PluginType MultitaskingPlugin::type()
PluginFlags MultitaskingPlugin::flags() const
{
return PluginFlag::Type_Fixed;
return PluginFlag::Type_Fixed | PluginFlag::Attribute_ForceDock;
}

2
plugins/show-desktop/showdesktopplugin.cpp
View File

@ -166,7 +166,7 @@ PluginsItemInterface::PluginType ShowDesktopPlugin::type()
PluginFlags ShowDesktopPlugin::flags() const
{
return PluginFlag::Type_Fixed;
return PluginFlag::Type_Fixed | PluginFlag::Attribute_ForceDock;
}
void ShowDesktopPlugin::updateVisible()

1
plugins/trash/trashwidget.cpp
View File

@ -221,6 +221,7 @@ void TrashWidget::updateIcon()
int pixmapSize = QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? size : int(size * ratio);
m_icon = icon.pixmap(pixmapSize, pixmapSize);
m_icon.setDevicePixelRatio(ratio);
m_icon = m_icon.scaled(pixmapSize * ratio, pixmapSize * ratio);
}
void TrashWidget::updateIconAndRefresh()