Skip to content

feat: improve battery icon loading strategy #348

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 7, 2025
Merged

feat: improve battery icon loading strategy #348

Show file tree
Hide file tree
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
26 changes: 21 additions & 5 deletions plugins/dde-dock/power/powerapplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,29 @@ void PowerApplet::onHighPerformanceSupportChanged(const bool isSupport)

void PowerApplet::refreshBatteryIcon(const QString &icon)
{
QString path = ":/batteryicons/batteryicons/" + icon;
QString iconName = icon;
QString fallbackPath = ":/batteryicons/batteryicons/" + icon + ".svg";

if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) {
path.append("-dark");
iconName.append("-dark");
fallbackPath = ":/batteryicons/batteryicons/" + icon + "-dark.svg";
}

// 首先尝试从主题加载图标
QIcon themeIcon = QIcon::fromTheme(iconName);
if (!themeIcon.isNull()) {
// 如果主题图标存在，使用主题图标
QPixmap pixmap = themeIcon.pixmap(m_batteryIcon->size());
m_batteryIcon->setPixmap(pixmap);
return;
}

// fallback使用资源文件
QSvgRenderer renderer(fallbackPath);
if (!renderer.isValid()) {
QString normalPath = ":/batteryicons/batteryicons/" + icon + ".svg";
renderer.load(normalPath);
}
path += ".svg";

QSvgRenderer renderer(path);

QSize size = m_batteryIcon->size();
QImage image(QSize(size * devicePixelRatioF()), QImage::Format_ARGB32_Premultiplied);
Expand Down
2 changes: 1 addition & 1 deletion plugins/dde-dock/power/powerstatuswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void PowerStatusWidget::refreshIcon()
.arg(percentageStr, plugged ? "plugged-symbolic" : "symbolic");
}

m_iconWidget->setIcon(iconStr, ":/batteryicons/resources/batteryicons/" + iconStr + ".svg");
m_iconWidget->setIcon(iconStr, ":/batteryicons/batteryicons/" + iconStr + ".svg");
m_applet->refreshBatteryIcon(iconStr);
}

Expand Down