diff --git a/wm/src/window_impl.cpp b/wm/src/window_impl.cpp old mode 100644 new mode 100755 index ce625c30..5930c66b --- a/wm/src/window_impl.cpp +++ b/wm/src/window_impl.cpp @@ -1873,11 +1873,11 @@ void WindowImpl::UpdatePointerEventForStretchableWindow(std::shared_ptrGetOriginRect(); PointInfo originPos = WindowHelper::CalculateOriginPosition(originRect, GetRect(), - { pointerItem.GetGlobalX(), pointerItem.GetGlobalY() }); - pointerItem.SetGlobalX(originPos.x); - pointerItem.SetGlobalY(originPos.y); - pointerItem.SetLocalX(originPos.x - originRect.posX_); - pointerItem.SetLocalY(originPos.y - originRect.posY_); + { pointerItem.GetDisplayX(), pointerItem.GetDisplayY() }); + pointerItem.SetDisplayX(originPos.x); + pointerItem.SetDisplayY(originPos.y); + pointerItem.SetWindowX(originPos.x - originRect.posX_); + pointerItem.SetWindowY(originPos.y - originRect.posY_); pointerEvent->UpdatePointerItem(pointerEvent->GetPointerId(), pointerItem); } @@ -1981,8 +1981,8 @@ void WindowImpl::ConsumeMoveOrDragEvent(std::shared_ptr& poin WLOGFW("Point item is invalid"); return; } - int32_t pointGlobalX = pointerItem.GetGlobalX(); - int32_t pointGlobalY = pointerItem.GetGlobalY(); + int32_t pointGlobalX = pointerItem.GetDisplayX(); + int32_t pointGlobalY = pointerItem.GetDisplayY(); int32_t action = pointerEvent->GetPointerAction(); switch (action) { // Ready to move or drag @@ -2042,7 +2042,7 @@ void WindowImpl::ConsumePointerEvent(std::shared_ptr& pointer WLOGFW("Point item is invalid"); return; } - if (!WindowHelper::IsPointInTargetRect(pointerItem.GetGlobalX(), pointerItem.GetGlobalY(), GetRect())) { + if (!WindowHelper::IsPointInTargetRect(pointerItem.GetDisplayX(), pointerItem.GetDisplayY(), GetRect())) { NotifyListenerAfterUnfocused(); return; } diff --git a/wm/test/systemtest/window_move_drag_test.cpp b/wm/test/systemtest/window_move_drag_test.cpp old mode 100644 new mode 100755 index 6b0de20f..cbcff597 --- a/wm/test/systemtest/window_move_drag_test.cpp +++ b/wm/test/systemtest/window_move_drag_test.cpp @@ -110,8 +110,8 @@ std::shared_ptr WindowMoveDragTest::CreatePointerEvent(int32_ { MMI::PointerEvent::PointerItem pointerItem; pointerItem.SetPointerId(pointerId); - pointerItem.SetGlobalX(posX); - pointerItem.SetGlobalY(posY); + pointerItem.SetDisplayX(posX); + pointerItem.SetDisplayY(posY); std::shared_ptr pointerEvent = MMI::PointerEvent::Create(); pointerEvent->AddPointerItem(pointerItem); diff --git a/wm/test/systemtest/window_test_utils.cpp b/wm/test/systemtest/window_test_utils.cpp old mode 100644 new mode 100755 index 43c0a97d..6155ab07 --- a/wm/test/systemtest/window_test_utils.cpp +++ b/wm/test/systemtest/window_test_utils.cpp @@ -225,8 +225,8 @@ std::shared_ptr WindowTestUtils::CreatePointerEvent(int32_t p { MMI::PointerEvent::PointerItem pointerItem; pointerItem.SetPointerId(pointerId); - pointerItem.SetGlobalX(posX); - pointerItem.SetGlobalY(posY); + pointerItem.SetDisplayX(posX); + pointerItem.SetDisplayY(posY); std::shared_ptr pointerEvent = MMI::PointerEvent::Create(); pointerEvent->AddPointerItem(pointerItem);