fix: Dragging an application will hide the dock

Add contextDragging state to DockPanel
AppItem and TrayPlugin will update when dragged and dropped

pms: BUG-289207
pms: BUG-289205

Author: robertkill

panels/dock/dockhelper.h

@@ -39,7 +39,7 @@ class DockHelper : public QObject
 
     void updateAllDockWakeArea();
 
-private Q_SLOTS:
+public Q_SLOTS:
     void checkNeedHideOrNot();
     void checkNeedShowOrNot();
 

panels/dock/dockpanel.cpp

@@ -38,6 +38,7 @@ DockPanel::DockPanel(QObject *parent)
     , m_loadTrayPlugins(new LoadTrayPlugins(this))
     , m_compositorReady(false)
     , m_launcherShown(false)
+    , m_contextDragging(false)
 {
     connect(this, &DockPanel::compositorReadyChanged, this, [this] {
         if (!m_compositorReady) return;
@@ -366,7 +367,7 @@ D_APPLET_CLASS(DockPanel)
 
 void DockPanel::setHideState(HideState newHideState)
 {
-    if (m_hideState == newHideState)
+    if (m_contextDragging | m_hideState == newHideState)
         return;
     m_hideState = newHideState;
     Q_EMIT hideStateChanged(m_hideState);
@@ -409,6 +410,21 @@ bool DockPanel::eventFilter(QObject *watched, QEvent *event)
 
     return false;
 }
+
+bool DockPanel::contextDragging() const
+{
+    return m_contextDragging;
+}
+
+void DockPanel::setContextDragging(bool newContextDragging)
+{
+    if (m_contextDragging == newContextDragging)
+        return;
+    m_contextDragging = newContextDragging;
+    if (!m_contextDragging)
+        m_helper->checkNeedHideOrNot();
+    emit contextDraggingChanged();
+}
 }
 
 #include "dockpanel.moc"

panels/dock/dockpanel.h

@@ -37,6 +37,8 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
 
     Q_PROPERTY(bool debugMode READ debugMode FINAL CONSTANT)
 
+    Q_PROPERTY(bool contextDragging READ contextDragging WRITE setContextDragging NOTIFY contextDraggingChanged FINAL)
+
 public:
     explicit DockPanel(QObject *parent = nullptr);
 
@@ -86,6 +88,9 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
 
     qreal devicePixelRatio() const;
 
+    bool contextDragging() const;
+    void setContextDragging(bool newContextDragging);
+
 protected:
     bool eventFilter(QObject *watched, QEvent *event) override;
 
@@ -112,6 +117,8 @@ private Q_SLOTS:
     void requestClosePopup();
     void devicePixelRatioChanged(qreal ratio);
 
+    void contextDraggingChanged();
+
 private:
     ColorTheme m_theme;
     HideState m_hideState;
@@ -120,6 +127,7 @@ private Q_SLOTS:
     LoadTrayPlugins *m_loadTrayPlugins;
     bool m_compositorReady;
     bool m_launcherShown;
+    bool m_contextDragging;
 };
 
 }

panels/dock/taskmanager/package/AppItem.qml

@@ -298,8 +298,12 @@ Item {
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         drag.target: root
         drag.onActiveChanged: {
-            if (!drag.active)
+            if (!drag.active) {
+                Panel.contextDragging = false
                 root.dragFinished()
+                return
+            }
+            Panel.contextDragging = true
         }
 
         onPressed: function (mouse) {
@@ -390,6 +394,8 @@ Item {
         keys: ["dfm_app_type_for_drag"]
 
         onDropped: function (drop){
+            // Panel.contextDragging = false
+            // console.log("Dropped on AppItem: " + drop.urls)
             root.dropFilesOnItem(root.itemId, drop.urls)
         }
     }

panels/dock/taskmanager/package/TaskManager.qml

@@ -145,6 +145,7 @@ ContainmentItem {
             }
 
             onDropped: function(drop) {
+                Panel.contextDragging = false
                 if (launcherDndDesktopId === "") return
                 let curX = taskmanager.useColumnLayout ? drop.y : drop.x
                 let cellWidth = visualModel.cellWidth

panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml

@@ -169,9 +169,12 @@ AppletItemButton {
     Drag.onActiveChanged: {
         DDT.TraySortOrderModel.actionsAlwaysVisible = Drag.active
         if (!Drag.active) {
+            Panel.contextDragging = false
             // reset position on drop
             Qt.callLater(() => { x = 0; y = 0; });
+            return
         }
+        Panel.contextDragging = true
     }
 
     DragHandler {

panels/dock/tray/package/DummyDelegate.qml

@@ -4,6 +4,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import org.deepin.ds.dock 1.0
 import org.deepin.ds.dock.tray 1.0 as DDT
 
 Button {
@@ -25,9 +26,12 @@ Button {
     Drag.onActiveChanged: {
         DDT.TraySortOrderModel.actionsAlwaysVisible = Drag.active
         if (!Drag.active) {
+            Panel.contextDragging = false
             // reset position on drop
             Qt.callLater(() => { x = 0; y = 0; });
+            return
         }
+        Panel.contextDragging = true
     }
     contentItem: Rectangle {
         color: "grey"