From a1d4fe00718abb40cdef39df7d15244e582409f9 Mon Sep 17 00:00:00 2001 From: "Liana Kazanova (xWF)" Date: Mon, 18 Nov 2024 19:14:42 +0000 Subject: Revert "Check if cursor has moved out of viewport bounds in Curs..." Revert submission 30111126-cd-cursor Reason for revert: DroidMonitor: Potential culprit for http://b/379706345 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:30111126-cd-cursor Change-Id: Ibff6c02be1359729802d4c85fa8dc0fdb4c75492 --- libs/input/PointerController.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libs/input/PointerController.cpp') diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index 59397dab592f..78d7d3a7051b 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -138,18 +138,15 @@ std::mutex& PointerController::getLock() const { return mDisplayInfoListener->mLock; } -vec2 PointerController::move(float deltaX, float deltaY) { +void PointerController::move(float deltaX, float deltaY) { const ui::LogicalDisplayId displayId = mCursorController.getDisplayId(); - ui::Transform transform; + vec2 transformed; { std::scoped_lock lock(getLock()); - transform = getTransformForDisplayLocked(displayId); + const auto& transform = getTransformForDisplayLocked(displayId); + transformed = transformWithoutTranslation(transform, {deltaX, deltaY}); } - - vec2 transformed = transformWithoutTranslation(transform, {deltaX, deltaY}); - - vec2 unconsumedDelta = mCursorController.move(transformed.x, transformed.y); - return transformWithoutTranslation(transform.inverse(), unconsumedDelta); + mCursorController.move(transformed.x, transformed.y); } void PointerController::setPosition(float x, float y) { -- cgit v1.2.3-59-g8ed1b