fix: Error with SmartHidden and KeepHidden modes of dock

1. SmartHide mode does not automatically hide
2. KeepHidden mode should not be hidden when a subwindow show

Log: pms-302819

Author: xionglinlin

frame/layershell/x11dlayershellemulation.cpp

@@ -151,7 +151,7 @@ void LayerShellEmulation::onPositionChanged()
 void LayerShellEmulation::onExclusionZoneChanged()
 {
     // dde-shell issues:379
-    if (m_dlayerShellWindow->exclusionZone() <= 0)
+    if (m_dlayerShellWindow->exclusionZone() < 0)
         return;
     auto scaleFactor = qGuiApp->devicePixelRatio();
     auto *x11Application = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();

panels/dock/dockhelper.cpp

@@ -96,9 +96,24 @@ bool DockHelper::eventFilter(QObject *watched, QEvent *event)
         m_hideTimer->start();
         break;
     }
-
+    case QEvent::Show: {
+        // if the dock's subwindow is show, the dock is not hidden
+        if (window->transientParent() != NULL && 
+            topTransientParent == parent()->rootObject()) {
+            m_subWindowShows.insert(window, true);
+            if (m_hideTimer->isActive()) {
+                m_hideTimer->stop();
+            }
+        }
+        break;
+    }
     case QEvent::Hide: {
         m_enters.remove(window);
+        if (window->transientParent() != NULL && 
+            topTransientParent == parent()->rootObject()) {
+            m_subWindowShows.remove(window);
+            m_hideTimer->start();
+        }
         break;
     }
     default: {
@@ -180,10 +195,14 @@ void DockHelper::checkNeedHideOrNot()
     }
 
     // any enter will not make hide
-    for (auto enter : m_enters) {
-        needHide &= !enter;
+    for (auto flag : m_enters) {
+        needHide &= !flag;
     }
 
+    for (auto show : m_subWindowShows) {
+        needHide &= !show;
+    }    
+
     if (needHide)
         parent()->setHideState(Hide);
 }
@@ -209,8 +228,8 @@ void DockHelper::checkNeedShowOrNot()
     }
     }
 
-    for (auto enter : m_enters) {
-        needShow |= enter;
+    for (auto flag : m_enters) {
+        needShow |= flag;
     }
 
     if (needShow)

panels/dock/dockhelper.h

@@ -49,6 +49,7 @@ private Q_SLOTS:
 private:
     QHash<QScreen *, DockWakeUpArea *> m_areas;
     QHash<QWindow *, bool> m_enters;
+    QHash<QWindow *, bool> m_subWindowShows;
     QTimer *m_hideTimer;
     QTimer *m_showTimer;
 };