Skip to content
Snippets Groups Projects
Commit fa8fcd87 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

callmessagedelegate: keep same text color as other message

Even if the luma can change due to Qt.lighter, we should keep the
same text color as we have for other messages.

Change-Id: Ie1178b673043ee281b382150bb808878fc0aa75c
GitLab: #1136
parent ac833340
No related branches found
No related tags found
No related merge requests found
...@@ -55,12 +55,13 @@ SBSMessageBase { ...@@ -55,12 +55,13 @@ SBSMessageBase {
property bool isActive: LRCInstance.indexOfActiveCall(ConfId, ActionUri, DeviceId) !== -1 property bool isActive: LRCInstance.indexOfActiveCall(ConfId, ActionUri, DeviceId) !== -1
visible: isActive || ConfId === "" || Duration > 0 visible: isActive || ConfId === "" || Duration > 0
property var baseColor: isOutgoing? CurrentConversation.color : JamiTheme.messageInBgColor
bubble.color: { bubble.color: {
if (ConfId === "" && Duration === 0) { if (ConfId === "" && Duration === 0) {
// If missed, we can add a darker pattern // 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: [ innerContent.children: [
...@@ -89,7 +90,7 @@ SBSMessageBase { ...@@ -89,7 +90,7 @@ SBSMessageBase {
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.MarkdownText textFormat: Text.MarkdownText
color: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark color: UtilsAdapter.luma(root.baseColor) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark
} }
JoinCallButton { JoinCallButton {
......
...@@ -340,7 +340,6 @@ Control { ...@@ -340,7 +340,6 @@ Control {
type: seq type: seq
isReply: root.isReply isReply: root.isReply
function getBaseColor() { function getBaseColor() {
var baseColor = isOutgoing ? CurrentConversation.color : JamiTheme.messageInBgColor var baseColor = isOutgoing ? CurrentConversation.color : JamiTheme.messageInBgColor
if (Id === MessagesAdapter.replyToId || Id === MessagesAdapter.editId) { if (Id === MessagesAdapter.replyToId || Id === MessagesAdapter.editId) {
......
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