From 9056371c41a7c9318286fca4c942d1c6ee4d9430 Mon Sep 17 00:00:00 2001 From: Rashad Sookram Date: Fri, 11 Mar 2022 11:38:56 -0500 Subject: [PATCH] Fix quote preview being cut off. When determining the height to force for the animation, the text was being measured assuming it had infinite width, which made it seem like it could fit on one line. --- .../org/thoughtcrime/securesms/components/InputPanel.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 670ad7d48e..5a0fbf318e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java @@ -187,7 +187,13 @@ public class InputPanel extends LinearLayout : 0; this.quoteView.setVisibility(VISIBLE); - this.quoteView.measure(0, 0); + + int maxWidth = composeContainer.getWidth(); + if (quoteView.getLayoutParams() instanceof MarginLayoutParams) { + MarginLayoutParams layoutParams = (MarginLayoutParams) quoteView.getLayoutParams(); + maxWidth -= layoutParams.leftMargin + layoutParams.rightMargin; + } + this.quoteView.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST), 0); if (quoteAnimator != null) { quoteAnimator.cancel();