From c57c11539fce2141832fe4ddf2553a3e6a191b50 Mon Sep 17 00:00:00 2001
From: fanpengcheng <fanpengcheng@uniontech.com>
Date: Mon, 17 Jan 2022 13:06:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=8B=96=E6=8B=BD=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

应用拖拽时，未移入对应的位置时，松手时都应返回原位置

Log: 修复应用图标拖拽顺序异常的问题
Influence: 应用图标拖拽(开特效或不开特效)
Bug: https://pms.uniontech.com/zentao/bug-view-111296.html
Change-Id: Ic84846b8a7d86559ea7d089252233f55506addce
---
 frame/item/components/appdragwidget.cpp |  2 --
 frame/window/mainpanelcontrol.cpp       | 23 +----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/frame/item/components/appdragwidget.cpp b/frame/item/components/appdragwidget.cpp
index 6c2521962..8796216fc 100644
--- a/frame/item/components/appdragwidget.cpp
+++ b/frame/item/components/appdragwidget.cpp
@@ -243,8 +243,6 @@ bool AppDragWidget::isRemoveable(const Position &dockPos, const QRect &doctRect)
                 return true;
             }
             break;
-        default:
-            break;
     }
     return false;
 }
diff --git a/frame/window/mainpanelcontrol.cpp b/frame/window/mainpanelcontrol.cpp
index e7ab3bba7..5d06328eb 100755
--- a/frame/window/mainpanelcontrol.cpp
+++ b/frame/window/mainpanelcontrol.cpp
@@ -856,28 +856,7 @@ DockItem *MainPanelControl::dropTargetItem(DockItem *sourceItem, QPoint point)
 
     if (!targetItem && parentWidget == m_appAreaSonWidget) {
         // appitem调整顺序是，判断是否拖放在两边空白区域
-
-        if (!m_appAreaSonLayout->count())
-            return targetItem;
-
-        DockItem *first = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(0)->widget());
-        DockItem *last = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(m_appAreaSonLayout->count() - 1)->widget());
-
-        if (m_position == Dock::Top || m_position == Dock::Bottom) {
-
-            if (point.x() < 0) {
-                targetItem = first;
-            } else {
-                targetItem = last;
-            }
-        } else {
-
-            if (point.y() < 0) {
-                targetItem = first;
-            } else {
-                targetItem = last;
-            }
-        }
+        targetItem = sourceItem;
     }
 
     return targetItem;