From 4b65c00912567afb050bf0d094ec6cadcbcc74ef Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Tue, 11 Dec 2018 20:43:01 +0200 Subject: [PATCH] [android] Fix transform of location in hitTesting. --- android/src/main/java/com/horcrux/svg/GroupView.java | 2 +- android/src/main/java/com/horcrux/svg/RenderableView.java | 2 +- android/src/main/java/com/horcrux/svg/TSpanView.java | 2 +- android/src/main/java/com/horcrux/svg/UseView.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/GroupView.java b/android/src/main/java/com/horcrux/svg/GroupView.java index ed371d50..4458880d 100644 --- a/android/src/main/java/com/horcrux/svg/GroupView.java +++ b/android/src/main/java/com/horcrux/svg/GroupView.java @@ -197,7 +197,7 @@ class GroupView extends RenderableView { float[] dst = new float[2]; mInvMatrix.mapPoints(dst, src); - mInvTransform.mapPoints(dst, src); + mInvTransform.mapPoints(dst); int x = Math.round(dst[0]); int y = Math.round(dst[1]); diff --git a/android/src/main/java/com/horcrux/svg/RenderableView.java b/android/src/main/java/com/horcrux/svg/RenderableView.java index ed895dc9..e223193d 100644 --- a/android/src/main/java/com/horcrux/svg/RenderableView.java +++ b/android/src/main/java/com/horcrux/svg/RenderableView.java @@ -434,7 +434,7 @@ abstract public class RenderableView extends VirtualView { float[] dst = new float[2]; mInvMatrix.mapPoints(dst, src); - mInvTransform.mapPoints(dst, src); + mInvTransform.mapPoints(dst); int x = Math.round(dst[0]); int y = Math.round(dst[1]); diff --git a/android/src/main/java/com/horcrux/svg/TSpanView.java b/android/src/main/java/com/horcrux/svg/TSpanView.java index 0967cb0f..61262fe4 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanView.java +++ b/android/src/main/java/com/horcrux/svg/TSpanView.java @@ -977,7 +977,7 @@ class TSpanView extends TextView { float[] dst = new float[2]; mInvMatrix.mapPoints(dst, src); - mInvTransform.mapPoints(dst, src); + mInvTransform.mapPoints(dst); int x = Math.round(dst[0]); int y = Math.round(dst[1]); diff --git a/android/src/main/java/com/horcrux/svg/UseView.java b/android/src/main/java/com/horcrux/svg/UseView.java index 08983937..6361a5b3 100644 --- a/android/src/main/java/com/horcrux/svg/UseView.java +++ b/android/src/main/java/com/horcrux/svg/UseView.java @@ -87,7 +87,7 @@ class UseView extends RenderableView { float[] dst = new float[2]; mInvMatrix.mapPoints(dst, src); - mInvTransform.mapPoints(dst, src); + mInvTransform.mapPoints(dst); VirtualView template = getSvgView().getDefinedTemplate(mHref); int hitChild = template.hitTest(dst);