From 4f60ceb1d4c7dd3b23eea41295d523a7f8d794fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Wed, 20 Nov 2019 17:28:54 +0100 Subject: [PATCH] Fix Regist Scrolling on Android harder --- .../java/com/metallic/chiaki/regist/RegistExecuteActivity.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt index 09a7070..d339578 100644 --- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt @@ -60,8 +60,11 @@ class RegistExecuteActivity: AppCompatActivity() logTextView.movementMethod = ScrollingMovementMethod() viewModel.logText.observe(this, Observer { val textLayout = logTextView.layout ?: return@Observer + val lineCount = textLayout.lineCount + if(lineCount < 1) + return@Observer logTextView.text = it - val scrollY = textLayout.getLineBottom(logTextView.lineCount - 1) - logTextView.height + logTextView.paddingTop + logTextView.paddingBottom + val scrollY = textLayout.getLineBottom(lineCount - 1) - logTextView.height + logTextView.paddingTop + logTextView.paddingBottom logTextView.scrollTo(0, max(scrollY, 0)) })