Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-05-30 22:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复在显示其他插件的Tips时无法弹出网络列表输入密码问题 (#713)

Browse Source 
修复在显示其他插件的Tips时无法弹出网络列表输入密码问题

Log: 修复在显示其他插件的Tips时无法弹出网络列表输入密码问题
Task: https://pms.uniontech.com/task-view-212979.html
Influence: 在显示其他插件的TIps或控制面板时，网络列表正常弹出
This commit is contained in:
chenjun 2022-11-09 11:36:00 +08:00 committed by GitHub
parent 1571d3099b
commit 35e32e3c05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/DdeDock/DdeDockConfig.cmake
View File

@ -1,2 +0,0 @@
set(DDE_DOCK_INCLUDE_DIR /usr/local/include/dde-dock)
include_directories("${DDE_DOCK_INCLUDE_DIR}")

15
frame/controller/dockpluginscontroller.cpp
View File

@ -110,6 +110,21 @@ void DockPluginsController::requestSetAppletVisible(PluginsItemInterface *const
return;
if (visible) {
// 在弹出界面前先隐藏其他插件的tips
QMap<PluginsItemInterface *, QMap<QString, QObject *>> &mPluginsMap = pluginsMap();
foreach (auto interface, mPluginsMap.keys()) {
if (interface != itemInter) {
foreach (auto oldItemKey, mPluginsMap[interface].keys()) {
if (oldItemKey != "pluginloader") {
PluginsItem *oldItem = qobject_cast<PluginsItem *>(pluginItemAt(interface, oldItemKey));
if (oldItem) {
oldItem->hidePopup();
}
}
}
}
}
item->showPopupApplet(itemInter->itemPopupApplet(itemKey));
} else {
item->hidePopup();

15
plugins/tray/system-trays/systemtrayscontroller.cpp
View File

@ -97,6 +97,21 @@ void SystemTraysController::requestSetAppletVisible(PluginsItemInterface * const
return;
if (visible) {
// 在弹出界面前先隐藏其他插件的tips
QMap<PluginsItemInterface *, QMap<QString, QObject *>> &mPluginsMap = pluginsMap();
foreach (auto interface, mPluginsMap.keys()) {
if (interface != itemInter) {
foreach (auto oldItemKey, mPluginsMap[interface].keys()) {
if (oldItemKey != "pluginloader") {
SystemTrayItem *oldItem = qobject_cast<SystemTrayItem *>(pluginItemAt(interface, oldItemKey));
if (oldItem) {
oldItem->hidePopup();
}
}
}
}
}
item->showPopupApplet(itemInter->itemPopupApplet(itemKey));
} else {
item->hidePopup();