From 87525c9917d7be9c6ea0721b0af3dd0c71848c8a Mon Sep 17 00:00:00 2001
From: yinjie <yinjie@uniontech.com>
Date: Tue, 10 May 2022 10:53:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20wayland=E7=8E=AF=E5=A2=83=E4=B8=8B?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=87=8D=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因：在处理wayland环境拖拽移除APP的时候没有考虑应用打开的情况，只进行undock操作，没有将图标重新插入到任务栏中。
修改方案：同X11一样处理，如果应用是开启状态，重新插入到任务栏中。

Log: 修复wayland环境下图标重叠的问题
Bug: https://pms.uniontech.com/bug-view-129443.html
Influence: wayland环境拖拽已打开应用的图标。
Change-Id: I9f1493840a89257078d3ea7eb95c5ae55c20c7be
---
 frame/window/mainpanelcontrol.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frame/window/mainpanelcontrol.cpp b/frame/window/mainpanelcontrol.cpp
index fda6a303b..3d9c459a3 100755
--- a/frame/window/mainpanelcontrol.cpp
+++ b/frame/window/mainpanelcontrol.cpp
@@ -759,6 +759,10 @@ void MainPanelControl::startDrag(DockItem *dockItem)
                         insertItem(m_dragIndex, item);
                         m_dragIndex = -1;
                     } else {
+                        if (-1 == m_appAreaSonLayout->indexOf(item) && m_dragIndex != -1) {
+                            insertItem(m_dragIndex, item);
+                            m_dragIndex = -1;
+                        }
                         AppItem *app = static_cast<AppItem *>(item.data());
                         app->undock();
                     }