Fix crashes
This commit is contained in:
@@ -176,8 +176,10 @@ class WebtoonScalingFrame @JvmOverloads constructor(
|
|||||||
val targetChild = findTargetChild()
|
val targetChild = findTargetChild()
|
||||||
adjustBounds()
|
adjustBounds()
|
||||||
targetChild.run {
|
targetChild.run {
|
||||||
scaleX = scale
|
if (!scale.isNaN()) {
|
||||||
scaleY = scale
|
scaleX = scale
|
||||||
|
scaleY = scale
|
||||||
|
}
|
||||||
translationX = transX
|
translationX = transX
|
||||||
translationY = transY
|
translationY = transY
|
||||||
if (pendingScroll != 0) {
|
if (pendingScroll != 0) {
|
||||||
@@ -298,7 +300,7 @@ class WebtoonScalingFrame @JvmOverloads constructor(
|
|||||||
distanceX: Float,
|
distanceX: Float,
|
||||||
distanceY: Float,
|
distanceY: Float,
|
||||||
): Boolean {
|
): Boolean {
|
||||||
if (scale <= 1f) return false
|
if (scale <= 1f || scale.isNaN()) return false
|
||||||
transformMatrix.postTranslate(-distanceX, -distanceY)
|
transformMatrix.postTranslate(-distanceX, -distanceY)
|
||||||
invalidateTarget()
|
invalidateTarget()
|
||||||
return true
|
return true
|
||||||
@@ -323,7 +325,7 @@ class WebtoonScalingFrame @JvmOverloads constructor(
|
|||||||
velocityX: Float,
|
velocityX: Float,
|
||||||
velocityY: Float,
|
velocityY: Float,
|
||||||
): Boolean {
|
): Boolean {
|
||||||
if (scale <= 1) return false
|
if (scale <= 1 || scale.isNaN()) return false
|
||||||
|
|
||||||
prevPos.set(transX.toInt(), transY.toInt())
|
prevPos.set(transX.toInt(), transY.toInt())
|
||||||
overScroller.fling(
|
overScroller.fling(
|
||||||
|
|||||||
Reference in New Issue
Block a user