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 #include +#include +#include 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;