From 49edbcdcef5015de192c62680b94b0abd384ff28 Mon Sep 17 00:00:00 2001
From: Fan PengCheng <fanpengcheng@uniontech.com>
Date: Mon, 19 Apr 2021 09:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E4=B8=BB=E5=B1=8F=E6=97=B6=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=A0=8F=E4=B8=80=E7=9B=B4=E9=9A=90=E8=97=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=AF=E8=83=BD=E6=97=A0=E6=B3=95=E5=94=A4=E9=86=92?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

仅显示在主屏时,设置监听区域的时候，如果判断副屏是否可显示任务栏，不符合会直接return，导致其他屏幕监听对应区域的代码未执行，改成continue就好了

Log: 修复任务栏一直隐藏模式可能无法显示的问题
Change-Id: I1e2b3c8777d7ee279a6d5462409ee97a7af03441
---
 frame/util/multiscreenworker.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
index 4324b8029..3764127a9 100644
--- a/frame/util/multiscreenworker.cpp
+++ b/frame/util/multiscreenworker.cpp
@@ -516,7 +516,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
     for (auto s : DIS_INS->screens()) {
         // 屏幕此位置不可停靠时,不用监听这块区域
         if (!DIS_INS->canDock(s, m_position))
-            return;
+            continue;
 
         MonitRect monitorRect;
         QRect screenRect = s->geometry();
@@ -565,7 +565,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
     for (auto s : DIS_INS->screens()) {
         // 屏幕此位置不可停靠时,不用监听这块区域
         if (!DIS_INS->canDock(s, m_position))
-            return;
+            continue;
 
         MonitRect monitorRect;
         QRect screenRect = s->geometry();
@@ -618,7 +618,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
     for (auto s : DIS_INS->screens()) {
         // 屏幕此位置不可停靠时,不用监听这块区域
         if (!DIS_INS->canDock(s, m_position))
-            return;
+            continue;
 
         MonitRect monitorRect;
         QRect screenRect = s->geometry();
@@ -1568,7 +1568,7 @@ void MultiScreenWorker::tryToShowDock(int eventX, int eventY)
     // 任务栏显示状态，但需要切换屏幕
     if (toScreen != m_ds.current()) {
         if (!m_delayWakeTimer->isActive()) {
-            m_delayScreen = toScreen;      
+            m_delayScreen = toScreen;
             m_delayWakeTimer->start(Utils::SettingValue("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", MonitorsSwitchTime, 2000).toInt());
         }
     } else {