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

fix: 将强依赖应用拖拽至回收站附近出现不知名的 + 号图标

Browse Source 
在拖拽时，原代码中判断是否垃圾箱插件区域有误，此时默认为允许拖拽，则会出现 + 号图标

Log: 修复将强依赖应用拖拽至回收站附近出现不知名的 + 号图标问题
Bug: https://pms.uniontech.com/zentao/bug-view-46894.html
Change-Id: I129678fa79b330ec38f1188e92d409b2b5851b9f
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4323
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: <mailman@uniontech.com>
This commit is contained in:
chenjun 2020-09-10 19:52:35 +08:00 committed by lizhongming
parent d384a81594
commit 12ad1f6293
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frame/panel/mainpanelcontrol.cpp
View File

@ -415,17 +415,14 @@ void MainPanelControl::moveItem(DockItem *sourceItem, DockItem *targetItem)
void MainPanelControl::dragEnterEvent(QDragEnterEvent *e)
{
QRect rect = QRect();
foreach (auto item, DockItemManager::instance()->itemList()) {
DockItem *dockItem = item.data();
PluginsItem *pluginItem = qobject_cast<PluginsItem *>(dockItem);
if (pluginItem && pluginItem->pluginName() == "trash") {
rect = pluginItem->geometry();
}
//拖拽图标到任务栏时，如果拖拽到垃圾箱插件图标widget上，则默认不允许拖拽，其他位置默认为允许拖拽
QWidget *widget = QApplication::widgetAt(QCursor::pos());
//"trash-centralwidget"名称是在PluginsItem类中m_centralWidget->setObjectName(pluginInter->pluginName() + "-centralwidget");
if (widget && widget->objectName() == "trash-centralwidget") {
return;
}
if (!rect.contains(e->pos()))
e->accept();
e->accept();
}
void MainPanelControl::dragLeaveEvent(QDragLeaveEvent *e)