From e19e5b458f81418e2d3c91dc86481253158c124d Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 29 Apr 2024 09:41:44 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=8B=E5=8A=BF=E7=AA=97=E5=8F=A3=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=97=B6=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ie8bfa84e65bd0868cf8a3215a6d5a284622d4b92
---
 service/window_manager/src/input_windows_manager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index fd51b6bdec..6a6198301e 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -2156,7 +2156,10 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
             touchWindow->area.y, touchWindow->flags, displayId, pointerEvent->GetTargetWindowId(),
             pointerEvent->GetAgentWindowId(), touchWindow->zOrder);
     }
-
+    bool gestureInject = false;
+    if ((pointerEvent->HasFlag(InputEvent::EVENT_FLAG_SIMULATE)) && MMI_GNE(pointerEvent->GetZorder(), 0.0f)) {
+        gestureInject = true;
+    }
     if (IsNeedDrawPointer(pointerItem)) {
         if (!IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
             IPointerDrawingManager::GetInstance()->SetMouseDisplayState(true);
@@ -2179,7 +2182,9 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
                 extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE))) {
                 MMI_HILOGD("PointerAction is to leave the window");
                 DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
-                IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
+                if (!gestureInject) {
+                    IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
+                }
             }
         }
     }
-- 
Gitee


From 754c25d2451dee4fe708cc8abb3321eaf6baf71f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 29 Apr 2024 10:11:53 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I87930df3f74e6e8ee2de322f42e61fd2dd1c0e12
---
 service/window_manager/src/input_windows_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 6a6198301e..d88432587f 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -2157,7 +2157,7 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
             pointerEvent->GetAgentWindowId(), touchWindow->zOrder);
     }
     bool gestureInject = false;
-    if ((pointerEvent->HasFlag(InputEvent::EVENT_FLAG_SIMULATE)) && MMI_GNE(pointerEvent->GetZorder(), 0.0f)) {
+    if ((pointerEvent->HasFlag(InputEvent::EVENT_FLAG_SIMULATE)) && MMI_GNE(pointerEvent->GetZOrder(), 0.0f)) {
         gestureInject = true;
     }
     if (IsNeedDrawPointer(pointerItem)) {
-- 
Gitee