Skip to content

fix: improve onboard plugin icon handling #345

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
mhduiy merged 1 commit into from
Aug 5, 2025
Merged

fix: improve onboard plugin icon handling #345

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
7 changes: 6 additions & 1 deletion plugins/dde-dock/common/commoniconbutton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,12 @@ void CommonIconButton::setIcon(const QString &icon, const QString &fallback, con
addDarkMark(tmp);
addDarkMark(tmpFallback);
}
m_icon = QIcon::fromTheme(tmp, QIcon::fromTheme(tmpFallback));
m_icon = QIcon::fromTheme(tmp);

if (m_icon.isNull()) {
m_icon = QIcon::fromTheme(tmpFallback);
}

if (m_icon.isNull()) {
QString defaultIcon = m_fileMapping[State::Default].first;
m_icon = QIcon::fromTheme(defaultIcon);
Expand Down
Binary file modified plugins/dde-dock/onboard/icon/dcc-onboard.dci
View file
Open in desktop
Binary file not shown.
8 changes: 3 additions & 5 deletions plugins/dde-dock/onboard/icon/keyboard-symbolic-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions plugins/dde-dock/onboard/icon/keyboard-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
139 changes: 0 additions & 139 deletions plugins/dde-dock/onboard/onboarditem.cpp
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions plugins/dde-dock/onboard/onboarditem.h
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions plugins/dde-dock/onboard/onboardplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ OnboardPlugin::OnboardPlugin(QObject *parent)
: QObject(parent)
, m_pluginLoaded(false)
, m_startupState(false)
, m_onboardItem(nullptr)
, m_onboardIcon(nullptr)
, m_tipsLabel(new TipsWidget)
, m_quickPanel(new QuickPanel)
{
Expand Down Expand Up @@ -47,7 +47,7 @@ QWidget *OnboardPlugin::itemWidget(const QString &itemKey)
return m_quickPanel.data();
}

return m_onboardItem.data();
return m_onboardIcon.data();
}

QWidget *OnboardPlugin::itemTipsWidget(const QString &itemKey)
Expand Down Expand Up @@ -151,7 +151,7 @@ void OnboardPlugin::displayModeChanged(const Dock::DisplayMode displayMode)
Q_UNUSED(displayMode);

if (!pluginIsDisable()) {
m_onboardItem->update();
m_onboardIcon->update();
}
}

Expand Down Expand Up @@ -180,7 +180,9 @@ void OnboardPlugin::loadPlugin()

m_pluginLoaded = true;

m_onboardItem.reset(new OnboardItem);
m_onboardIcon.reset(new CommonIconButton);
m_onboardIcon->setFixedSize(Dock::DOCK_PLUGIN_ITEM_FIXED_SIZE);
m_onboardIcon->setIcon(":/icons/icon/keyboard-symbolic.svg");

@sourcery-ai sourcery-ai Bot Aug 4, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Hardcoded icon path may reduce theme flexibility.

Consider using a theme icon name instead of a hardcoded resource path if supporting theme customization is required.

Suggested implementation:

    m_onboardIcon.reset(new CommonIconButton);
    m_onboardIcon->setFixedSize(Dock::DOCK_PLUGIN_ITEM_FIXED_SIZE);
    // Use theme icon name for better theme flexibility
    m_onboardIcon->setIcon("input-keyboard");

If CommonIconButton::setIcon does not support theme icon names directly, you may need to use QIcon::fromTheme("input-keyboard", QIcon(":/icons/icon/keyboard-symbolic.svg")) to provide a fallback. For example:

m_onboardIcon->setIcon(QIcon::fromTheme("input-keyboard", QIcon(":/icons/icon/keyboard-symbolic.svg")));

Adjust as needed based on how CommonIconButton expects its icon to be set.


m_proxyInter->itemAdded(this, pluginName());
displayModeChanged(displayMode());
Expand Down
3 changes: 1 addition & 2 deletions plugins/dde-dock/onboard/onboardplugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
#ifndef ONBOARDPLUGIN_H
#define ONBOARDPLUGIN_H

#include "pluginsiteminterface_v2.h"

Check warning on line 8 in plugins/dde-dock/onboard/onboardplugin.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "pluginsiteminterface_v2.h" not found.
#include "onboarditem.h"
#include "quickpanel.h"
#include "tipswidget.h"

Check warning on line 10 in plugins/dde-dock/onboard/onboardplugin.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "tipswidget.h" not found.

#include <QLabel>
#include <QScopedPointer>
Expand Down Expand Up @@ -52,7 +51,7 @@
bool m_pluginLoaded;
bool m_startupState;

QScopedPointer<OnboardItem> m_onboardItem;
QScopedPointer<CommonIconButton> m_onboardIcon;
QScopedPointer<Dock::TipsWidget> m_tipsLabel;
QScopedPointer<QuickPanel> m_quickPanel;
};
Expand Down