fix: dock will not auto hide after set size

Issue: linuxdeepin/developer-center#7129 Log:
linuxdeepin · Jan 30, 2024 · 06d668c · 06d668c
1 parent 2b81011
commit 06d668c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
@@ -521,6 +521,7 @@ void MultiScreenWorker::onRequestUpdateMonitorInfo()
 
 void MultiScreenWorker::onRequestDelayShowDock()
 {
+    tryToHideDock();
     // 移动Dock至相应屏相应位置
     if (testState(LauncherDisplay))//启动器显示,则dock不显示
         return;
@@ -548,7 +549,7 @@ void MultiScreenWorker::onRequestDelayShowDock()
 
 void MultiScreenWorker::initMembers()
 {
-    m_monitorUpdateTimer->setInterval(100);
+    m_monitorUpdateTimer->setInterval(1000);
     m_monitorUpdateTimer->setSingleShot(true);
 
     m_delayWakeTimer->setSingleShot(true);
@@ -957,3 +958,16 @@ void MultiScreenWorker::tryToShowDock(int eventX, int eventY)
         }
     }
 }
+
+void MultiScreenWorker::tryToHideDock()
+{
+    if (hideMode() == HideMode::KeepShowing) {
+        return;
+    }
+
+    auto mousePos = QCursor::pos();
+    const QString &currentScreen = DOCK_SCREEN->current();
+    if (isCursorOut(mousePos.x(), mousePos.y())) {
+        Q_EMIT requestPlayAnimation(currentScreen, m_position, Dock::AniAction::Hide);
+    }
+}
diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h
@@ -153,6 +153,7 @@ private slots:
     void reInitDisplayData();
 
     void tryToShowDock(int eventX, int eventY);
+    void tryToHideDock();
     void changeDockPosition(QString fromScreen, QString toScreen, const Position &fromPos, const Position &toPos);
 
     void resetDockScreen();