1
0
mirror of https://github.com/MGislv/NekoX.git synced 2024-07-04 11:13:36 +00:00

Fix emoji display in three-lines DialogCell

This commit is contained in:
luvletter2333 2021-04-27 19:40:30 +08:00
parent 71289f6c78
commit fa796e34d6
No known key found for this signature in database
GPG Key ID: BFD68B892BECC1D8

View File

@ -1588,6 +1588,7 @@ public class DialogCell extends BaseCell {
messageNameString = s; messageNameString = s;
} }
} }
messageNameString = Emoji.replaceEmoji(messageNameString, Theme.dialogs_messageNamePaint.getFontMetricsInt(), AndroidUtilities.dp(12), false);
messageNameLayout = StaticLayoutEx.createStaticLayout(messageNameString, Theme.dialogs_messageNamePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0, false, TextUtils.TruncateAt.END, messageWidth, 1); messageNameLayout = StaticLayoutEx.createStaticLayout(messageNameString, Theme.dialogs_messageNamePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0, false, TextUtils.TruncateAt.END, messageWidth, 1);
} catch (Exception e) { } catch (Exception e) {
FileLog.e(e); FileLog.e(e);
@ -1619,6 +1620,7 @@ public class DialogCell extends BaseCell {
if (hasMessageThumb && messageNameString != null) { if (hasMessageThumb && messageNameString != null) {
messageWidth += AndroidUtilities.dp(6); messageWidth += AndroidUtilities.dp(6);
} }
messageStringFinal = Emoji.replaceEmoji(messageStringFinal, currentMessagePaint.getFontMetricsInt(), AndroidUtilities.dp(12), false);
messageLayout = StaticLayoutEx.createStaticLayout(messageStringFinal, currentMessagePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, AndroidUtilities.dp(1), false, TextUtils.TruncateAt.END, messageWidth, messageNameString != null ? 1 : 2); messageLayout = StaticLayoutEx.createStaticLayout(messageStringFinal, currentMessagePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, AndroidUtilities.dp(1), false, TextUtils.TruncateAt.END, messageWidth, messageNameString != null ? 1 : 2);
} else { } else {
if (hasMessageThumb) { if (hasMessageThumb) {
@ -1627,6 +1629,7 @@ public class DialogCell extends BaseCell {
messageLeft -= thumbSize + AndroidUtilities.dp(6); messageLeft -= thumbSize + AndroidUtilities.dp(6);
} }
} }
messageStringFinal = Emoji.replaceEmoji(messageStringFinal,currentMessagePaint.getFontMetricsInt(), AndroidUtilities.dp(12), false);
messageLayout = new StaticLayout(messageStringFinal, currentMessagePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); messageLayout = new StaticLayout(messageStringFinal, currentMessagePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
} }
} catch (Exception e) { } catch (Exception e) {