From 12ad1f6293017ad736df4f42338773be89990a95 Mon Sep 17 00:00:00 2001 From: chenjun Date: Thu, 10 Sep 2020 19:52:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86=E5=BC=BA=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=8B=96=E6=8B=BD=E8=87=B3=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=AB=99=E9=99=84=E8=BF=91=E5=87=BA=E7=8E=B0=E4=B8=8D=E7=9F=A5?= =?UTF-8?q?=E5=90=8D=E7=9A=84=20+=20=E5=8F=B7=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在拖拽时，原代码中判断是否垃圾箱插件区域有误，此时默认为允许拖拽，则会出现 + 号图标 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: Reviewed-by: fanpengcheng Reviewed-by: lizhongming Tested-by: --- frame/panel/mainpanelcontrol.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index 993c3bccd..4206d3ea7 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -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(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)