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

Commit af17a33f authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "Remove rotation based scaling" into sc-dev am: 6438998d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14471490

Change-Id: Ic070cb72e62c84c9debe991609f02195fd902c69
parents c6da50d5 6438998d

native/android/surface_control.cpp

+1 −22
Original line number Diff line number Diff line
@@ -454,28 +454,7 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction, 
        sourceRect.makeInvalid();

    }

    transaction->setBufferCrop(surfaceControl, sourceRect);



    int destW = destRect.width();

    int destH = destRect.height();

    if (destRect.left < 0) {

        destRect.left = 0;

        destRect.right = destW;

    }

    if (destRect.top < 0) {

        destRect.top = 0;

        destRect.bottom = destH;

    }



    if (!sourceRect.isEmpty()) {

        float sx = destW / static_cast<float>(sourceRect.width());

        float sy = destH / static_cast<float>(sourceRect.height());

        transaction->setPosition(surfaceControl, destRect.left - (sourceRect.left * sx),

                                 destRect.top - (sourceRect.top * sy));

        transaction->setMatrix(surfaceControl, sx, 0, 0, sy);

    } else {

        transaction->setPosition(surfaceControl, destRect.left, destRect.top);

    }



    transaction->setDestinationFrame(surfaceControl, destRect);

    transaction->setTransform(surfaceControl, transform);

    bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) ==

            NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;