Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc6b362 authored by chaviw's avatar chaviw
Browse files

Use transform in pointerCoordsFromNative and not just offset 

The raw pointer coords are purely raw coordinates in screen space. They
do not include any transformation. Therefore, we need to use the
transform object and not just offset values to calculate the transformed
coordinates.

Test: MotionEventTest#testTransformShouldApplyMatrixToPointsAndPreserveRawPosition
Fixes: 162446411
Change-Id: Idd4c10f0ff5243006a6240558f6b12cf139b455d
parent c0850b8e

core/jni/android_view_MotionEvent.cpp

+8 −7
Original line number Diff line number Diff line
@@ -256,11 +256,13 @@ static jfloatArray obtainPackedAxisValuesArray(JNIEnv* env, uint32_t minSize, 
}



static void pointerCoordsFromNative(JNIEnv* env, const PointerCoords* rawPointerCoords,

        float xOffset, float yOffset, jobject outPointerCoordsObj) {

    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.x,

            rawPointerCoords->getAxisValue(AMOTION_EVENT_AXIS_X) + xOffset);

    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.y,

            rawPointerCoords->getAxisValue(AMOTION_EVENT_AXIS_Y) + yOffset);

                                    ui::Transform transform, jobject outPointerCoordsObj) {

    float rawX = rawPointerCoords->getAxisValue(AMOTION_EVENT_AXIS_X);

    float rawY = rawPointerCoords->getAxisValue(AMOTION_EVENT_AXIS_Y);

    vec2 transformed = transform.transform(rawX, rawY);



    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.x, transformed.x);

    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.y, transformed.y);

    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.pressure,

            rawPointerCoords->getAxisValue(AMOTION_EVENT_AXIS_PRESSURE));

    env->SetFloatField(outPointerCoordsObj, gPointerCoordsClassInfo.size,
@@ -433,8 +435,7 @@ static void android_view_MotionEvent_nativeGetPointerCoords(JNIEnv* env, jclass 
        }

        rawPointerCoords = event->getHistoricalRawPointerCoords(pointerIndex, historyPos);

    }

    pointerCoordsFromNative(env, rawPointerCoords, event->getXOffset(), event->getYOffset(),

            outPointerCoordsObj);

    pointerCoordsFromNative(env, rawPointerCoords, event->getTransform(), outPointerCoordsObj);

}



static void android_view_MotionEvent_nativeGetPointerProperties(JNIEnv* env, jclass clazz,