From 0a4ef381d15e4e93dac5a6d82181ea45dea38377 Mon Sep 17 00:00:00 2001
From: wangxuwen <wangxuwen_cm@deepin.com>
Date: Mon, 9 Sep 2019 13:26:27 +0800
Subject: [PATCH] fixed(dock): fixed the bug 8232 for dde-trash can reside in
 app area

---
 frame/panel/mainpanelcontrol.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp
index e00629230..2aa98ae90 100644
--- a/frame/panel/mainpanelcontrol.cpp
+++ b/frame/panel/mainpanelcontrol.cpp
@@ -28,6 +28,8 @@
 
 #include <QDrag>
 #include <QTimer>
+#include <QStandardPaths>
+#include <QString>
 
 DWIDGET_USE_NAMESPACE
 
@@ -343,6 +345,12 @@ void MainPanelControl::dragEnterEvent(QDragEnterEvent *e)
         return;
     }
 
+    //如果当前从桌面拖拽的的app是trash，则不能放入app任务栏中
+    QString str = "file://";
+    str.append(QStandardPaths::locate(QStandardPaths::DesktopLocation, "dde-trash.desktop"));
+    if (str == e->mimeData()->data(m_draggingMimeKey))
+        return;
+
     if (m_delegate && m_delegate->appIsOnDock(e->mimeData()->data(m_draggingMimeKey)))
         return;