mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00
fix: 修复快捷面板没有自动刷新图标的问题
在快捷面板图标中增加updateShow方法,在插件更新的时候,调用该方法来更新界面 Log: Influence: 执行快捷面板中的截图图标,观察图标是否发生变化 Task: https://pms.uniontech.com/task-view-220599.html Change-Id: I252fdd4f562e7da4d6a8033ae0ce5ddbb5b233f3
This commit is contained in:
parent
fe06c5c91a
commit
9ebbd85dde
@ -36,6 +36,12 @@ FullQuickItem::~FullQuickItem()
|
||||
m_centerWidget->setParent(nullptr);
|
||||
}
|
||||
|
||||
void FullQuickItem::updateShow()
|
||||
{
|
||||
if (m_centerWidget)
|
||||
m_centerWidget->update();
|
||||
}
|
||||
|
||||
QuickSettingItem::QuickSettingType FullQuickItem::type() const
|
||||
{
|
||||
return QuickSettingItem::QuickSettingType::Full;
|
||||
|
@ -30,6 +30,7 @@ class FullQuickItem : public QuickSettingItem
|
||||
public:
|
||||
FullQuickItem(PluginsItemInterface *const pluginInter, QWidget *parent = nullptr);
|
||||
~FullQuickItem() override;
|
||||
void updateShow() override;
|
||||
|
||||
QuickSettingType type() const override;
|
||||
|
||||
|
@ -33,7 +33,9 @@ static QSize expandSize = QSize(20, 20);
|
||||
|
||||
MultiQuickItem::MultiQuickItem(PluginsItemInterface *const pluginInter, QWidget *parent)
|
||||
: QuickSettingItem(pluginInter, parent)
|
||||
, m_selfDefine(false)
|
||||
, m_iconWidget(nullptr)
|
||||
, m_nameLabel(nullptr)
|
||||
, m_stateLabel(nullptr)
|
||||
{
|
||||
initUi();
|
||||
}
|
||||
@ -45,6 +47,21 @@ MultiQuickItem::~MultiQuickItem()
|
||||
itemWidget->setParent(nullptr);
|
||||
}
|
||||
|
||||
void MultiQuickItem::updateShow()
|
||||
{
|
||||
if (m_iconWidget && m_nameLabel && m_stateLabel) {
|
||||
m_iconWidget->update();
|
||||
m_nameLabel->setText(QFontMetrics(m_nameLabel->font()).elidedText(pluginItem()->pluginDisplayName(), Qt::TextElideMode::ElideRight, m_nameLabel->width()));
|
||||
m_stateLabel->setText(QFontMetrics(m_stateLabel->font()).elidedText(pluginItem()->description(), Qt::TextElideMode::ElideRight, m_stateLabel->width()));
|
||||
} else {
|
||||
QWidget *itemWidget = pluginItem()->itemWidget(QUICK_ITEM_KEY);
|
||||
if (itemWidget) {
|
||||
// 如果插件没有返回图标的显示,则获取插件的itemWidget
|
||||
itemWidget->update();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QuickSettingItem::QuickSettingType MultiQuickItem::type() const
|
||||
{
|
||||
return QuickSettingItem::QuickSettingType::Multi;
|
||||
@ -52,7 +69,7 @@ QuickSettingItem::QuickSettingType MultiQuickItem::type() const
|
||||
|
||||
bool MultiQuickItem::eventFilter(QObject *obj, QEvent *event)
|
||||
{
|
||||
if (m_selfDefine) {
|
||||
if (m_iconWidget) {
|
||||
if (event->type() == QEvent::MouseButtonRelease) {
|
||||
if (obj->objectName() == "expandLabel") {
|
||||
// 如果是鼠标的按下事件
|
||||
@ -75,9 +92,9 @@ bool MultiQuickItem::eventFilter(QObject *obj, QEvent *event)
|
||||
if (!labelWidget)
|
||||
return QuickSettingItem::eventFilter(obj, event);
|
||||
|
||||
if (labelWidget->objectName() == "nameLabel") {
|
||||
if (labelWidget == m_nameLabel) {
|
||||
labelWidget->setText(QFontMetrics(labelWidget->font()).elidedText(pluginItem()->pluginDisplayName(), Qt::TextElideMode::ElideRight, labelWidget->width()));
|
||||
} else if (labelWidget->objectName() == "stateLabel") {
|
||||
} else if (labelWidget == m_stateLabel) {
|
||||
labelWidget->setText(QFontMetrics(labelWidget->font()).elidedText(pluginItem()->description(), Qt::TextElideMode::ElideRight, labelWidget->width()));
|
||||
}
|
||||
}
|
||||
@ -111,38 +128,38 @@ void MultiQuickItem::initUi()
|
||||
iconLayout->setSpacing(0);
|
||||
iconLayout->setAlignment(Qt::AlignCenter);
|
||||
|
||||
QWidget *iconWidget = new QuickIconWidget(pluginItem(), itemKey(), iconWidgetParent);
|
||||
iconWidget->setFixedSize(BGSIZE, BGSIZE);
|
||||
iconLayout->addWidget(iconWidget);
|
||||
m_iconWidget = new QuickIconWidget(pluginItem(), itemKey(), iconWidgetParent);
|
||||
m_iconWidget->setFixedSize(BGSIZE, BGSIZE);
|
||||
iconLayout->addWidget(m_iconWidget);
|
||||
mainLayout->addWidget(iconWidgetParent);
|
||||
mainLayout->addSpacing(10);
|
||||
|
||||
// 添加中间的名称部分
|
||||
QWidget *textWidget = new QWidget(this);
|
||||
QLabel *nameLabel = new QLabel(textWidget);
|
||||
QLabel *stateLabel = new QLabel(textWidget);
|
||||
nameLabel->setObjectName("nameLabel");
|
||||
stateLabel->setObjectName("stateLabel");
|
||||
m_nameLabel = new QLabel(textWidget);
|
||||
m_stateLabel = new QLabel(textWidget);
|
||||
m_nameLabel->setObjectName("nameLabel");
|
||||
m_stateLabel->setObjectName("stateLabel");
|
||||
|
||||
// 设置图标和文字的属性
|
||||
QFont nameFont = DFontSizeManager::instance()->t6();
|
||||
nameFont.setBold(true);
|
||||
QPalette pe;
|
||||
pe.setColor(QPalette::WindowText, Qt::black);
|
||||
nameLabel->setPalette(pe);
|
||||
stateLabel->setPalette(pe);
|
||||
nameLabel->setFont(nameFont);
|
||||
stateLabel->setFont(DFontSizeManager::instance()->t10());
|
||||
nameLabel->setText(pluginItem()->pluginDisplayName());
|
||||
stateLabel->setText(pluginItem()->description());
|
||||
nameLabel->installEventFilter(this);
|
||||
stateLabel->installEventFilter(this);
|
||||
m_nameLabel->setPalette(pe);
|
||||
m_stateLabel->setPalette(pe);
|
||||
m_nameLabel->setFont(nameFont);
|
||||
m_stateLabel->setFont(DFontSizeManager::instance()->t10());
|
||||
m_nameLabel->setText(pluginItem()->pluginDisplayName());
|
||||
m_stateLabel->setText(pluginItem()->description());
|
||||
m_nameLabel->installEventFilter(this);
|
||||
m_stateLabel->installEventFilter(this);
|
||||
|
||||
QVBoxLayout *textLayout = new QVBoxLayout(textWidget);
|
||||
textLayout->setContentsMargins(0, 0, 0, 0);
|
||||
textLayout->setSpacing(0);
|
||||
textLayout->addWidget(nameLabel);
|
||||
textLayout->addWidget(stateLabel);
|
||||
textLayout->addWidget(m_nameLabel);
|
||||
textLayout->addWidget(m_stateLabel);
|
||||
textLayout->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
|
||||
mainLayout->addWidget(textWidget);
|
||||
|
||||
@ -160,7 +177,6 @@ void MultiQuickItem::initUi()
|
||||
pe.setBrush(QPalette::Window, Qt::transparent);
|
||||
expandLabel->setPalette(pe);
|
||||
mainLayout->addWidget(expandWidgetParent);
|
||||
m_selfDefine = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -23,6 +23,8 @@
|
||||
|
||||
#include <quicksettingitem.h>
|
||||
|
||||
class QuickIconWidget;
|
||||
|
||||
class MultiQuickItem : public QuickSettingItem
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -30,6 +32,7 @@ class MultiQuickItem : public QuickSettingItem
|
||||
public:
|
||||
MultiQuickItem(PluginsItemInterface *const pluginInter, QWidget *parent = nullptr);
|
||||
~MultiQuickItem() override;
|
||||
void updateShow() override;
|
||||
|
||||
QuickSettingType type() const override;
|
||||
|
||||
@ -41,7 +44,9 @@ private:
|
||||
QString expandFileName() const;
|
||||
|
||||
private:
|
||||
bool m_selfDefine;
|
||||
QuickIconWidget *m_iconWidget;
|
||||
QLabel *m_nameLabel;
|
||||
QLabel *m_stateLabel;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -58,15 +58,7 @@ void SingleQuickItem::mouseReleaseEvent(QMouseEvent *event)
|
||||
|
||||
void SingleQuickItem::resizeEvent(QResizeEvent *event)
|
||||
{
|
||||
if (property("paint").toBool()) {
|
||||
QLabel *imageLabel = findChildLabel(this, "imageLabel");
|
||||
if (imageLabel) {
|
||||
// 更新图像
|
||||
imageLabel->setPixmap(pixmap());
|
||||
}
|
||||
updatePluginName(findChildLabel(this, "textLabel"));
|
||||
}
|
||||
|
||||
updateShow();
|
||||
QuickSettingItem::resizeEvent(event);
|
||||
}
|
||||
|
||||
@ -181,3 +173,19 @@ void SingleQuickItem::updatePluginName(QLabel *textLabel)
|
||||
text = ftm.elidedText(text, Qt::TextElideMode::ElideRight, textLabel->width());
|
||||
textLabel->setText(text);
|
||||
}
|
||||
|
||||
void SingleQuickItem::updateShow()
|
||||
{
|
||||
if (property("paint").toBool()) {
|
||||
QLabel *imageLabel = findChildLabel(this, "imageLabel");
|
||||
if (imageLabel) {
|
||||
// 更新图像
|
||||
imageLabel->setPixmap(pixmap());
|
||||
}
|
||||
updatePluginName(findChildLabel(this, "textLabel"));
|
||||
} else {
|
||||
QWidget *itemWidget = pluginItem()->itemWidget(QUICK_ITEM_KEY);
|
||||
if (itemWidget)
|
||||
itemWidget->update();
|
||||
}
|
||||
}
|
||||
|
@ -32,6 +32,7 @@ public:
|
||||
~SingleQuickItem() override;
|
||||
|
||||
QuickSettingType type() const override;
|
||||
void updateShow() override;
|
||||
|
||||
protected:
|
||||
void mouseReleaseEvent(QMouseEvent *event) override;
|
||||
|
@ -43,6 +43,7 @@ public:
|
||||
PluginsItemInterface *pluginItem() const;
|
||||
ItemType itemType() const override;
|
||||
virtual const QPixmap dragPixmap();
|
||||
virtual void updateShow() {}
|
||||
const QString itemKey() const;
|
||||
|
||||
virtual QuickSettingType type() const = 0;
|
||||
|
@ -452,7 +452,7 @@ void QuickSettingContainer::onPluginUpdated(PluginsItemInterface *itemInter, con
|
||||
if (settingItem->pluginItem() != itemInter)
|
||||
continue;
|
||||
|
||||
settingItem->update();
|
||||
settingItem->updateShow();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user