diff --git a/frame/window/quicksettingcontainer.cpp b/frame/window/quicksettingcontainer.cpp index a91ebc6ab..1b119415d 100644 --- a/frame/window/quicksettingcontainer.cpp +++ b/frame/window/quicksettingcontainer.cpp @@ -169,7 +169,7 @@ void QuickSettingContainer::onItemDetailClick(PluginsItemInterface *pluginInter) if (!quickItemWidget) return; - QWidget *widget = pluginInter->itemPopupApplet(QUICK_ITEM_DETAIL_KEY); + QWidget *widget = pluginInter->itemPopupApplet(QUICK_ITEM_KEY); if (!widget) return; @@ -198,11 +198,11 @@ bool QuickSettingContainer::eventFilter(QObject *watched, QEvent *event) if (!isApplet(plugin)) continue; - if (plugin->itemWidget(QUICK_ITEM_DETAIL_KEY) != watched) + if (plugin->itemWidget(QUICK_ITEM_KEY) != watched) continue; m_dragInfo->dragPosition = mouseEvent->pos(); - m_dragInfo->dragItem = plugin->itemWidget(QUICK_ITEM_DETAIL_KEY); + m_dragInfo->dragItem = plugin->itemWidget(QUICK_ITEM_KEY); m_dragInfo->pluginInter = plugin; break; } @@ -240,7 +240,7 @@ QPoint QuickSettingContainer::hotSpot(const QPixmap &pixmap) bool QuickSettingContainer::isApplet(PluginsItemInterface *itemInter) const { - if (!itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY)) + if (!itemInter->itemWidget(QUICK_ITEM_KEY)) return false; QJsonObject json = QuickSettingController::instance()->metaData(itemInter); @@ -252,7 +252,7 @@ bool QuickSettingContainer::isApplet(PluginsItemInterface *itemInter) const void QuickSettingContainer::onPluginInsert(PluginsItemInterface * itemInter) { - QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY); + QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_KEY); if (isApplet(itemInter)) { // 如果存在这个窗体,就让其显示在下方 DBlurEffectWidget *effectWidget = new DBlurEffectWidget(m_componentWidget); @@ -278,7 +278,7 @@ void QuickSettingContainer::onPluginInsert(PluginsItemInterface * itemInter) void QuickSettingContainer::onPluginRemove(PluginsItemInterface * itemInter) { - QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_DETAIL_KEY); + QWidget *itemWidget = itemInter->itemWidget(QUICK_ITEM_KEY); if (itemWidget) { for (int i = 0; i < m_componentWidget->layout()->count(); i++) { QLayoutItem *layoutItem = m_componentWidget->layout()->itemAt(i); @@ -524,7 +524,7 @@ void QuickSettingContainer::onResizeView() void QuickSettingContainer::onRequestAppletShow(PluginsItemInterface *itemInter, const QString &itemKey) { - if (itemKey == QUICK_ITEM_DETAIL_KEY) { + if (itemKey == QUICK_ITEM_KEY) { // 显示弹出的内容 QWidget *itemApplet = itemInter->itemPopupApplet(itemKey); if (!itemApplet) diff --git a/interfaces/pluginsiteminterface.h b/interfaces/pluginsiteminterface.h index 8474e1d0e..0e148d599 100644 --- a/interfaces/pluginsiteminterface.h +++ b/interfaces/pluginsiteminterface.h @@ -35,7 +35,7 @@ enum class DockPart { }; // 快捷面板详情页面的itemWidget对应的itemKey -#define QUICK_ITEM_DETAIL_KEY "quick_item_detail_key" +#define QUICK_ITEM_KEY "quick_item_key" /// /// \brief The PluginsItemInterface class /// the dock plugins item interface, all dock plugins should diff --git a/plugins/bluetooth/bluetoothplugin.cpp b/plugins/bluetooth/bluetoothplugin.cpp index 1b9534cf2..ce4c6e178 100644 --- a/plugins/bluetooth/bluetoothplugin.cpp +++ b/plugins/bluetooth/bluetoothplugin.cpp @@ -104,7 +104,7 @@ QWidget *BluetoothPlugin::itemPopupApplet(const QString &itemKey) return m_bluetoothItem->popupApplet(); } - if (itemKey == QUICK_ITEM_DETAIL_KEY) { + if (itemKey == QUICK_ITEM_KEY) { return m_bluetoothItem->popupApplet(); } diff --git a/plugins/sound/soundplugin.cpp b/plugins/sound/soundplugin.cpp index 81d915ffd..c2c8be211 100644 --- a/plugins/sound/soundplugin.cpp +++ b/plugins/sound/soundplugin.cpp @@ -63,7 +63,7 @@ void SoundPlugin::init(PluginProxyInterface *proxyInter) if (!pluginIsDisable()) { m_proxyInter->itemAdded(this, SOUND_KEY); connect(m_soundWidget.data(), &SoundWidget::rightIconClick, this, [ this, proxyInter ] { - proxyInter->requestSetAppletVisible(this, QUICK_ITEM_DETAIL_KEY, true); + proxyInter->requestSetAppletVisible(this, QUICK_ITEM_KEY, true); }); } } @@ -85,7 +85,7 @@ QWidget *SoundPlugin::itemWidget(const QString &itemKey) if (itemKey == SOUND_KEY) return m_soundItem.data(); - if (itemKey == QUICK_ITEM_DETAIL_KEY) + if (itemKey == QUICK_ITEM_KEY) return m_soundWidget.data(); return nullptr; @@ -104,7 +104,7 @@ QWidget *SoundPlugin::itemPopupApplet(const QString &itemKey) if (itemKey == SOUND_KEY) { return m_soundItem->popupApplet(); } - if (itemKey == QUICK_ITEM_DETAIL_KEY) + if (itemKey == QUICK_ITEM_KEY) return m_soundDeviceWidget.data(); return nullptr;