diff --git a/src/app/commoncomponents/CallMessageDelegate.qml b/src/app/commoncomponents/CallMessageDelegate.qml index b7c66eff798288c97066d027a9ea52904eea4e07..709eba8b0d0d68733b5dcb902a612d05531693f0 100644 --- a/src/app/commoncomponents/CallMessageDelegate.qml +++ b/src/app/commoncomponents/CallMessageDelegate.qml @@ -55,12 +55,13 @@ SBSMessageBase { property bool isActive: LRCInstance.indexOfActiveCall(ConfId, ActionUri, DeviceId) !== -1 visible: isActive || ConfId === "" || Duration > 0 + property var baseColor: isOutgoing? CurrentConversation.color : JamiTheme.messageInBgColor bubble.color: { if (ConfId === "" && Duration === 0) { // If missed, we can add a darker pattern - return isOutgoing ? Qt.lighter(CurrentConversation.color, 1.15) : Qt.darker(JamiTheme.messageInBgColor, 1.15); + return Qt.lighter(root.baseColor, 1.15) } - return isOutgoing ? CurrentConversation.color : JamiTheme.messageInBgColor; + return root.baseColor } innerContent.children: [ @@ -89,7 +90,7 @@ SBSMessageBase { renderType: Text.NativeRendering textFormat: Text.MarkdownText - color: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark + color: UtilsAdapter.luma(root.baseColor) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark } JoinCallButton { diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml index 2375a9a2bf45302242621390c0bd13a97254d615..8fc642c92b51b24ba8b2342b97cfeeb71b275323 100644 --- a/src/app/commoncomponents/SBSMessageBase.qml +++ b/src/app/commoncomponents/SBSMessageBase.qml @@ -340,7 +340,6 @@ Control { type: seq isReply: root.isReply - function getBaseColor() { var baseColor = isOutgoing ? CurrentConversation.color : JamiTheme.messageInBgColor if (Id === MessagesAdapter.replyToId || Id === MessagesAdapter.editId) {