Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed(sni):invalid plugin not insert to tray

Browse Source 
无效插件不添加到托盘区域，避免托盘出现空图标
This commit is contained in:
shaojun 2019-12-14 13:54:17 +08:00
parent 8bd687eb21
commit 0356c5ca54
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/tray/snitraywidget.cpp
View File

@ -27,7 +27,7 @@
#include <xcb/xproto.h>
#define IconSize 16
#define IconSize 20
const QStringList ItemCategoryList {"ApplicationStatus", "Communications", "SystemServices", "Hardware"};
const QStringList ItemStatusList {"Passive", "Active", "NeedsAttention"};
@ -346,7 +346,9 @@ void SNITrayWidget::showContextMenu(int x, int y)
qDebug() << "context menu has not be ready, init menu";
initMenu();
}
m_menu->popup(QPoint(x, y));
if (m_menu)
m_menu->popup(QPoint(x, y));
}
hidePopup();
}

3
plugins/tray/trayplugin.cpp
View File

@ -407,6 +407,9 @@ void TrayPlugin::traySNIAdded(const QString &itemKey, const QString &sniServiceP
}
SNITrayWidget *trayWidget = new SNITrayWidget(sniServicePath);
if (!trayWidget->isValid())
return;
if (trayWidget->status() == SNITrayWidget::ItemStatus::Passive) {
m_passiveSNITrayMap.insert(itemKey, trayWidget);
} else {