Skip to content
Snippets Groups Projects
Commit 9e846818 authored by Fadi Shehadeh's avatar Fadi Shehadeh Committed by Sébastien Blin
Browse files

emoji: fix background color

- isEmojiOnly changed to message containing only an emoji, not an edit or reply.
- adapted size

GitLab: #957

Change-Id: I78388a406a2a0b9c93f1c291850062fd9bf04a54
parent c0fdeb3f
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,7 @@ SBSMessageBase { ...@@ -78,7 +78,7 @@ SBSMessageBase {
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
selectByMouse: true selectByMouse: true
font.pixelSize: isEmojiOnly? JamiTheme.chatviewEmojiSize : JamiTheme.chatviewFontSize font.pixelSize: isEmojiOnly? JamiTheme.chatviewEmojiSize : JamiTheme.emojiBubbleSize
font.hintingPreference: Font.PreferNoHinting font.hintingPreference: Font.PreferNoHinting
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.MarkdownText textFormat: Text.MarkdownText
......
...@@ -479,7 +479,8 @@ MessageListModel::dataForItem(item_t item, int, int role) const ...@@ -479,7 +479,8 @@ MessageListModel::dataForItem(item_t item, int, int role) const
case Role::Readers: case Role::Readers:
return QVariant(messageToReaders_[item.first]); return QVariant(messageToReaders_[item.first]);
case Role::IsEmojiOnly: case Role::IsEmojiOnly:
return QVariant(isOnlyEmoji(item.second.body)); return QVariant(replyId.isEmpty() && item.second.previousBodies.isEmpty()
&& isOnlyEmoji(item.second.body));
case Role::Reactions: case Role::Reactions:
return QVariant(item.second.reactions); return QVariant(item.second.reactions);
default: default:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment