From 01a7c937710a3a82f13827a252e71cfdb7c723cb Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 17 Feb 2017 17:06:18 +0100 Subject: [PATCH] If an avatar is shown for a message in group layout, make the bubble a little bit smaller. --- .../src/main/java/com/b44t/messenger/MessageObject.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index ce8982b97..e79cbc557 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -627,14 +627,15 @@ public class MessageObject { }*/ int maxWidth; + boolean substractAvatar = !isOut() && MrMailbox.getChat((int)messageOwner.dialog_id).getType()==MrChat.MR_CHAT_GROUP; if (AndroidUtilities.isTablet()) { - if (messageOwner.from_id > 0 && (messageOwner.to_id.channel_id != 0 || messageOwner.to_id.chat_id != 0) && !isOut()) { + if (substractAvatar) { maxWidth = AndroidUtilities.getMinTabletSide() - AndroidUtilities.dp(122); } else { maxWidth = AndroidUtilities.getMinTabletSide() - AndroidUtilities.dp(80); } } else { - if (messageOwner.from_id > 0 && (messageOwner.to_id.channel_id != 0 || messageOwner.to_id.chat_id != 0) && !isOut()) { + if (substractAvatar) { maxWidth = Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) - AndroidUtilities.dp(122); } else { maxWidth = Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) - AndroidUtilities.dp(80);