Skip to content

sync: from linuxdeepin/dtkdeclarative #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Aug 13, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/private/dquickiconimage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ void DQuickIconImagePrivate::init()
{
D_Q(DQuickIconImage);

if (iconType == ThemeIconName) {
// 强制确保图标的缩放比例正确
updateDevicePixelRatio(1.0);
// 强制确保图标的缩放比例正确
updateDevicePixelRatio(1.0);

if (iconType == ThemeIconName) {
QObject::connect(DGuiApplicationHelper::instance()->applicationTheme(), SIGNAL(iconThemeNameChanged(QByteArray)),
q, SLOT(maybeUpdateUrl()));
// dtk build-in 类型的图标支持区分窗口主题色, 此处需在主题类型变化时更新图标
Expand Down Expand Up @@ -372,10 +372,8 @@ void DQuickIconImage::pixmapChange()
// QQuickImage中只会在设置了souceSize的前提下才会计算图片自身的缩放比例
// 此处强制确保图标的缩放比例正确
D_D(DQuickIconImage);
if (d->iconType == DQuickIconImagePrivate::ThemeIconName) {
if (d->updateDevicePixelRatio(1.0)) {
d->maybeUpdateUrl();
}
if (d->updateDevicePixelRatio(1.0)) {
d->maybeUpdateUrl();
}

QQuickImage::pixmapChange();
Expand Down
Loading