diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/input/InputWindow.cpp | 20 | ||||
| -rw-r--r-- | libs/input/tests/InputWindow_test.cpp | 6 | ||||
| -rw-r--r-- | libs/ui/Transform.cpp | 8 | ||||
| -rw-r--r-- | libs/ui/include/ui/Transform.h | 3 |
4 files changed, 28 insertions, 9 deletions
diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp index 36c1f8068d..d5d35e6a96 100644 --- a/libs/input/InputWindow.cpp +++ b/libs/input/InputWindow.cpp @@ -57,7 +57,7 @@ bool InputWindowInfo::operator==(const InputWindowInfo& info) const { info.frameLeft == frameLeft && info.frameTop == frameTop && info.frameRight == frameRight && info.frameBottom == frameBottom && info.surfaceInset == surfaceInset && info.globalScaleFactor == globalScaleFactor && - info.windowXScale == windowXScale && info.windowYScale == windowYScale && + info.transform == transform && info.touchableRegion.hasSameRects(touchableRegion) && info.visible == visible && info.canReceiveKeys == canReceiveKeys && info.trustedOverlay == trustedOverlay && info.hasFocus == hasFocus && info.hasWallpaper == hasWallpaper && @@ -93,8 +93,12 @@ status_t InputWindowInfo::writeToParcel(android::Parcel* parcel) const { parcel->writeInt32(frameBottom) ?: parcel->writeInt32(surfaceInset) ?: parcel->writeFloat(globalScaleFactor) ?: - parcel->writeFloat(windowXScale) ?: - parcel->writeFloat(windowYScale) ?: + parcel->writeFloat(transform.dsdx()) ?: + parcel->writeFloat(transform.dtdx()) ?: + parcel->writeFloat(transform.tx()) ?: + parcel->writeFloat(transform.dtdy()) ?: + parcel->writeFloat(transform.dsdy()) ?: + parcel->writeFloat(transform.ty()) ?: parcel->writeBool(visible) ?: parcel->writeBool(canReceiveKeys) ?: parcel->writeBool(hasFocus) ?: @@ -132,14 +136,19 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) { flags = Flags<Flag>(parcel->readInt32()); type = static_cast<Type>(parcel->readInt32()); + float dsdx, dtdx, tx, dtdy, dsdy, ty; status = parcel->readInt32(&frameLeft) ?: parcel->readInt32(&frameTop) ?: parcel->readInt32(&frameRight) ?: parcel->readInt32(&frameBottom) ?: parcel->readInt32(&surfaceInset) ?: parcel->readFloat(&globalScaleFactor) ?: - parcel->readFloat(&windowXScale) ?: - parcel->readFloat(&windowYScale) ?: + parcel->readFloat(&dsdx) ?: + parcel->readFloat(&dtdx) ?: + parcel->readFloat(&tx) ?: + parcel->readFloat(&dtdy) ?: + parcel->readFloat(&dsdy) ?: + parcel->readFloat(&ty) ?: parcel->readBool(&visible) ?: parcel->readBool(&canReceiveKeys) ?: parcel->readBool(&hasFocus) ?: @@ -165,6 +174,7 @@ status_t InputWindowInfo::readFromParcel(const android::Parcel* parcel) { } touchableRegionCropHandle = parcel->readStrongBinder(); + transform.set(std::array<float, 9>{dsdx, dtdx, tx, dtdy, dsdy, ty, 0, 0, 1}); return OK; } diff --git a/libs/input/tests/InputWindow_test.cpp b/libs/input/tests/InputWindow_test.cpp index e7a4587bfc..3da869b739 100644 --- a/libs/input/tests/InputWindow_test.cpp +++ b/libs/input/tests/InputWindow_test.cpp @@ -53,8 +53,7 @@ TEST(InputWindowInfo, Parcelling) { i.frameBottom = 19; i.surfaceInset = 17; i.globalScaleFactor = 0.3; - i.windowXScale = 0.4; - i.windowYScale = 0.5; + i.transform.set(std::array<float, 9>{0.4, -1, 100, 0.5, 0, 40, 0, 0, 1}); i.visible = false; i.canReceiveKeys = false; i.hasFocus = false; @@ -85,8 +84,7 @@ TEST(InputWindowInfo, Parcelling) { ASSERT_EQ(i.frameBottom, i2.frameBottom); ASSERT_EQ(i.surfaceInset, i2.surfaceInset); ASSERT_EQ(i.globalScaleFactor, i2.globalScaleFactor); - ASSERT_EQ(i.windowXScale, i2.windowXScale); - ASSERT_EQ(i.windowYScale, i2.windowYScale); + ASSERT_EQ(i.transform, i2.transform); ASSERT_EQ(i.visible, i2.visible); ASSERT_EQ(i.canReceiveKeys, i2.canReceiveKeys); ASSERT_EQ(i.hasFocus, i2.hasFocus); diff --git a/libs/ui/Transform.cpp b/libs/ui/Transform.cpp index 3bf3903929..5424a3ca9e 100644 --- a/libs/ui/Transform.cpp +++ b/libs/ui/Transform.cpp @@ -133,6 +133,14 @@ float Transform::dsdy() const { return mMatrix[1][1]; } +float Transform::getScaleX() const { + return sqrt(dsdx() * dsdx()) + (dtdx() * dtdx()); +} + +float Transform::getScaleY() const { + return sqrt((dtdy() * dtdy()) + (dsdy() * dsdy())); +} + void Transform::reset() { mType = IDENTITY; for(size_t i = 0; i < 3; i++) { diff --git a/libs/ui/include/ui/Transform.h b/libs/ui/include/ui/Transform.h index cf59467367..2612e821d0 100644 --- a/libs/ui/include/ui/Transform.h +++ b/libs/ui/include/ui/Transform.h @@ -74,6 +74,9 @@ public: float dtdy() const; float dsdy() const; + float getScaleX() const; + float getScaleY() const; + // modify the transform void reset(); void set(float tx, float ty); |