From 96b41bde76edeba607af829e0de6fc54efe7a3a8 Mon Sep 17 00:00:00 2001
From: chenbin <chenbina@uniontech.com>
Date: Thu, 26 May 2022 19:39:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DPGV=E8=A7=A6=E6=8E=A7?=
 =?UTF-8?q?=E5=B1=8F=E4=B8=8B=E8=AE=BE=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=A0=8F?=
 =?UTF-8?q?=E4=B8=80=E7=9B=B4=E9=9A=90=E8=97=8F=E4=BB=A5=E5=90=8E=E6=89=8B?=
 =?UTF-8?q?=E6=8C=87=E6=97=A0=E6=B3=95=E5=94=A4=E8=B5=B7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

wayland环境下触摸移动时会发出CursorMove信号,此时不能将触摸的状态改为false,应该将鼠标按下的状态改为false

Log: 修复PGV触控屏下设置任务栏一直隐藏以后手指无法唤起的问题
Influence: wayland环境下触摸唤起任务栏
Bug: https://pms.uniontech.com/bug-view-128169.html
Change-Id: I7c145753439de3059391790c893f4b3b1ccbf2f0
---
 frame/util/multiscreenworker.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
index ebdc5991b..94e9aed4d 100644
--- a/frame/util/multiscreenworker.cpp
+++ b/frame/util/multiscreenworker.cpp
@@ -1431,7 +1431,9 @@ void MultiScreenWorker::checkXEventMonitorService()
         });
 
         // 触屏时，后端只发送press、release消息，有move消息则为鼠标，press置false
-        connect(touchEventInter, &XEventMonitor::CursorMove, this, [ = ] { setStates(TouchPress, false); });
+        connect(touchEventInter, &XEventMonitor::CursorMove, this, [ = ] {
+            setStates(Utils::IS_WAYLAND_DISPLAY? MousePress : TouchPress, false);
+        });
         connect(touchEventInter, &XEventMonitor::ButtonPress, this, &MultiScreenWorker::onTouchPress);
         connect(touchEventInter, &XEventMonitor::ButtonRelease, this, &MultiScreenWorker::onTouchRelease);
     };