From 6866b7a27700cbea87f3967b7cd1f8c14d62ccbe Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 26 May 2021 11:13:25 -0300 Subject: [PATCH] Fix chat color selection context menu positioning. --- .../conversation/colors/ui/ChatSelectionContextMenu.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatSelectionContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatSelectionContextMenu.kt index d8c6535ec8..92d0989b96 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatSelectionContextMenu.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatSelectionContextMenu.kt @@ -56,8 +56,10 @@ class ChatSelectionContextMenu(val context: Context) : PopupWindow(context) { anchor.getDrawingRect(rect) root.offsetDescendantRectToMyCoords(anchor, rect) - if (rect.bottom + contentView.height > root.bottom) { - showAsDropDown(anchor, 0, -(contentView.height + anchor.height)) + contentView.measure(0, 0) + + if (rect.bottom + contentView.measuredHeight > root.bottom) { + showAsDropDown(anchor, 0, -(contentView.measuredHeight + anchor.height)) } else { showAsDropDown(anchor, 0, 0) }