openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-20 20:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1095 pointer事件global坐标，local坐标命名改为display、window

Browse Source 
Merge pull request !1095 from 杨洲/yz
This commit is contained in:
openharmony_ci
2022-07-07 06:58:09 +00:00
committed by Gitee
parent 7b42ef4443 0460d02b3b
commit 498a827ab9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/src/window_impl.cpp
Regular → Executable
+8 -8
View File
@@ -1873,11 +1873,11 @@ void WindowImpl::UpdatePointerEventForStretchableWindow(std::shared_ptr<MMI::Poi
const Rect& originRect = property_->GetOriginRect();
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<MMI::PointerEvent>& 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<MMI::PointerEvent>& 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;
}
wm/test/systemtest/window_move_drag_test.cpp
Regular → Executable
+2 -2
View File
@@ -110,8 +110,8 @@ std::shared_ptr<MMI::PointerEvent> 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<MMI::PointerEvent> pointerEvent = MMI::PointerEvent::Create();
pointerEvent->AddPointerItem(pointerItem);
wm/test/systemtest/window_test_utils.cpp
Regular → Executable
+2 -2
View File
@@ -225,8 +225,8 @@ std::shared_ptr<MMI::PointerEvent> 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<MMI::PointerEvent> pointerEvent = MMI::PointerEvent::Create();
pointerEvent->AddPointerItem(pointerItem);