!48930 解决全屏/自由窗口切换,第一次多选拖拽,聚拢效果从窗口外移动进入问题

Merge pull request !48930 from Hone/fyq1119
This commit is contained in:
openharmony_ci 2024-11-21 13:04:45 +00:00 committed by Gitee
commit f3c8b93e26
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1718,7 +1718,7 @@ OffsetF DragDropManager::GetTouchOffsetRelativeToSubwindow(int32_t containerId,
containerId >= MIN_SUBCONTAINER_ID ? SubwindowManager::GetInstance()->GetParentContainerId(containerId)
: containerId);
CHECK_NULL_RETURN(subwindow, OffsetF(x, y));
auto subwindowOffset = subwindow->GetRect().GetOffset();
auto subwindowOffset = subwindow->GetWindowRect().GetOffset();
touchOffset.SetX(touchOffset.GetX() - subwindowOffset.GetX());
touchOffset.SetY(touchOffset.GetY() - subwindowOffset.GetY());
return touchOffset;