From 7ea5ca2cf19cef910a7e0c28ac1929521cedc9eb Mon Sep 17 00:00:00 2001
From: qintongtong <qintongtong@huawei.com>
Date: Fri, 29 Mar 2024 09:27:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: qintongtong <qintongtong@huawei.com>
Change-Id: I20c97615c06aa04b4b1d4b4c4ac18bdea76799b6
---
 .../src/scene_session_dirty_manager.cpp       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/window_scene/session_manager/src/scene_session_dirty_manager.cpp b/window_scene/session_manager/src/scene_session_dirty_manager.cpp
index 216e23bb5e..c36a5084b9 100644
--- a/window_scene/session_manager/src/scene_session_dirty_manager.cpp
+++ b/window_scene/session_manager/src/scene_session_dirty_manager.cpp
@@ -34,7 +34,7 @@ constexpr float DIRECTION180 = 180 ;
 constexpr float DIRECTION270 = 270 ;
 constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "SceneSessionDirtyManager"};
 constexpr unsigned int POINTER_CHANGE_AREA_COUNT = 8;
-constexpr int POINTER_CHANGE_AREA_SEXTEEN = 16;
+constexpr int POINTER_CHANGE_AREA_SIXTEEN = 16;
 constexpr int POINTER_CHANGE_AREA_DEFAULT = 0;
 constexpr int POINTER_CHANGE_AREA_FIVE = 5;
 constexpr int UPDATE_TASK_DURATION = 10;
@@ -359,28 +359,28 @@ void SceneSessionDirtyManager::UpdatePointerAreas(sptr<SceneSession> sceneSessio
                 vpr = screenSession->GetScreenProperty().GetDensity();
             }
         }
-        int32_t pointerArea_Five_Px = static_cast<int32_t>(POINTER_CHANGE_AREA_FIVE * vpr);
-        int32_t pointerArea_Sexteen_Px = static_cast<int32_t>(POINTER_CHANGE_AREA_SEXTEEN * vpr);
+        int32_t pointerAreaFivePx = static_cast<int32_t>(POINTER_CHANGE_AREA_FIVE * vpr);
+        int32_t pointerAreaSixteenPx = static_cast<int32_t>(POINTER_CHANGE_AREA_SIXTEEN * vpr);
 
         if (sceneSession->GetSessionInfo().isSetPointerAreas_) {
             pointerChangeAreas = {POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT,
-                POINTER_CHANGE_AREA_DEFAULT, pointerArea_Five_Px, pointerArea_Sexteen_Px,
-                pointerArea_Five_Px, pointerArea_Sexteen_Px, pointerArea_Five_Px};
+                POINTER_CHANGE_AREA_DEFAULT, pointerAreaFivePx, pointerAreaSixteenPx,
+                pointerAreaFivePx, pointerAreaSixteenPx, pointerAreaFivePx};
             return;
         }
         auto limits = sceneSession->GetSessionProperty()->GetWindowLimits();
         if (limits.minWidth_ == limits.maxWidth_ && limits.minHeight_ != limits.maxHeight_) {
-            pointerChangeAreas = {POINTER_CHANGE_AREA_DEFAULT, pointerArea_Five_Px,
+            pointerChangeAreas = {POINTER_CHANGE_AREA_DEFAULT, pointerAreaFivePx,
                 POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT,
-                pointerArea_Five_Px, POINTER_CHANGE_AREA_DEFAULT,  POINTER_CHANGE_AREA_DEFAULT};
+                pointerAreaFivePx, POINTER_CHANGE_AREA_DEFAULT,  POINTER_CHANGE_AREA_DEFAULT};
         } else if (limits.minWidth_ != limits.maxWidth_ && limits.minHeight_ == limits.maxHeight_) {
             pointerChangeAreas = {POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT,
-                POINTER_CHANGE_AREA_DEFAULT, pointerArea_Five_Px, POINTER_CHANGE_AREA_DEFAULT,
-                POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT, pointerArea_Five_Px};
+                POINTER_CHANGE_AREA_DEFAULT, pointerAreaFivePx, POINTER_CHANGE_AREA_DEFAULT,
+                POINTER_CHANGE_AREA_DEFAULT, POINTER_CHANGE_AREA_DEFAULT, pointerAreaFivePx};
         } else if (limits.minWidth_ != limits.maxWidth_ && limits.minHeight_ != limits.maxHeight_) {
-            pointerChangeAreas = {pointerArea_Sexteen_Px, pointerArea_Five_Px,
-                pointerArea_Sexteen_Px, pointerArea_Five_Px, pointerArea_Sexteen_Px,
-                pointerArea_Five_Px, pointerArea_Sexteen_Px, pointerArea_Five_Px};
+            pointerChangeAreas = {pointerAreaSixteenPx, pointerAreaFivePx,
+                pointerAreaSixteenPx, pointerAreaFivePx, pointerAreaSixteenPx,
+                pointerAreaFivePx, pointerAreaSixteenPx, pointerAreaFivePx};
         }
     } else {
         WLOGFD("UpdatePointerAreas sceneSession is: %{public}d dragEnabled is false", sceneSession->GetPersistentId());
-- 
Gitee