From 69920f2bd8cf625b2e5dc8c90b76cb1cd6cb093b Mon Sep 17 00:00:00 2001 From: liuyao Date: Mon, 6 Jan 2020 17:20:12 +0800 Subject: [PATCH] feat:Forbid dragging trash to dock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加禁止将启动器中的回收站拖入dock栏 (task:8554) --- frame/panel/mainpanelcontrol.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index e521cee95..0a1f132e2 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -356,8 +356,13 @@ void MainPanelControl::dragEnterEvent(QDragEnterEvent *e) //如果当前从桌面拖拽的的app是trash，则不能放入app任务栏中 QString str = "file://"; + //启动器 + QString str_t = ""; + str.append(QStandardPaths::locate(QStandardPaths::DesktopLocation, "dde-trash.desktop")); - if (str == e->mimeData()->data(m_draggingMimeKey)) + str_t.append(QStandardPaths::locate(QStandardPaths::ApplicationsLocation, "dde-trash.desktop")); + + if ((str == e->mimeData()->data(m_draggingMimeKey)) || (str_t == e->mimeData()->data(m_draggingMimeKey))) return; if (m_delegate && m_delegate->appIsOnDock(e->mimeData()->data(m_draggingMimeKey)))