From 253d0af770b14d03c15323525bc51a163c0ee5e2 Mon Sep 17 00:00:00 2001 From: donghualin Date: Fri, 23 Dec 2022 17:12:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=9C=A8=E4=BB=BB=E5=8A=A1=E6=A0=8F=E6=98=BE=E7=A4=BA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 一些插件无需在控制中心设置，必须在任务栏显示，例如截图计时、快捷插件组合图标等，因此，增加该接口对这类插件的处理 Log: 增加任务栏显示插件的标记 Influence: 截图，观察任务栏是否有计时的图标 Task: https://pms.uniontech.com/task-view-226407.html Bug: https://pms.uniontech.com/bug-view-179083.html Change-Id: Ifaa71182ee1d19633460db76302dc1ad094ab91f --- frame/window/quickpluginmodel.cpp | 5 ++--- interfaces/pluginsiteminterface.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frame/window/quickpluginmodel.cpp b/frame/window/quickpluginmodel.cpp index 190871af5..aa70f3b96 100644 --- a/frame/window/quickpluginmodel.cpp +++ b/frame/window/quickpluginmodel.cpp @@ -169,8 +169,8 @@ void QuickPluginModel::initConnection() if (quickWidget && !quickWidget->parentWidget()) quickWidget->setVisible(false); - // 用来读取已经固定在下方的插件 - if (!m_dockedPluginIndex.contains(itemInter->pluginName())) + // 用来读取已经固定在下方的插件或者强制显示的插件 + if (!m_dockedPluginIndex.contains(itemInter->pluginName()) && !(itemInter->flags() & Attribute_ForceDock)) return; m_dockedPluginsItems << itemInter; @@ -279,7 +279,6 @@ int QuickPluginModel::generaIndex(int insertIndex, int oldIndex) if (pluginDockIndex >= insertIndex) { m_dockedPluginIndex[itemInter->pluginName()]++; } - qInfo() << itemInter->pluginDisplayName() << m_dockedPluginIndex[itemInter->pluginName()]; } } } diff --git a/interfaces/pluginsiteminterface.h b/interfaces/pluginsiteminterface.h index a50daca7d..a04af6c5c 100644 --- a/interfaces/pluginsiteminterface.h +++ b/interfaces/pluginsiteminterface.h @@ -54,6 +54,7 @@ enum PluginFlag { Attribute_CanDrag = 0x200, // 插件属性-是否支持拖动 Attribute_CanInsert = 0x400, // 插件属性-是否支持在其前面插入其他的插件，普通的快捷插件是支持的 Attribute_CanSetting = 0x800, // 插件属性-是否可以在控制中心设置显示或隐藏 + Attribute_ForceDock = 0x1000, // 插件属性-强制显示在任务栏上 FlagMask = 0xffffffff // 掩码 };