Force a layout pass to ensure spans are measured correctly (#3600)

Fixes https://github.com/tuskyapp/Tusky/issues/3596
This commit is contained in:
Nik Clayton 2023-04-30 21:50:52 +02:00 committed by GitHub
parent 11cf93fa55
commit 0a39ee7ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions

View File

@ -114,6 +114,14 @@ class ClickableSpanTextView @JvmOverloads constructor(
lengthAfter: Int lengthAfter: Int
) { ) {
super.onTextChanged(text, start, lengthBefore, lengthAfter) super.onTextChanged(text, start, lengthBefore, lengthAfter)
// TextView tries to optimise the layout process, and will not perform a layout if the
// new text takes the same area as the old text (see TextView.checkForRelayout()). This
// can result in statuses using the wrong clickable areas as they are never remeasured.
// (https://github.com/tuskyapp/Tusky/issues/3596). Force a layout pass to ensure that
// the spans are measured correctly.
if (!isInLayout) requestLayout()
doOnLayout { measureSpans() } doOnLayout { measureSpans() }
} }
@ -126,11 +134,11 @@ class ClickableSpanTextView @JvmOverloads constructor(
* If the span runs over multiple lines there will be two Rects per line. * If the span runs over multiple lines there will be two Rects per line.
*/ */
private fun measureSpans() { private fun measureSpans() {
val spannedText = text as? Spanned ?: return
spanRects.clear() spanRects.clear()
delegateRects.clear() delegateRects.clear()
val spannedText = text as? Spanned ?: return
// The goal is to record all the [Rect]s associated with a span with the same fidelity // The goal is to record all the [Rect]s associated with a span with the same fidelity
// that the user sees when they highlight text in the view to select it. // that the user sees when they highlight text in the view to select it.
// //
@ -358,7 +366,7 @@ class ClickableSpanTextView @JvmOverloads constructor(
} }
companion object { companion object {
const val TAG = "LinkTextView" const val TAG = "ClickableSpanTextView"
} }
} }