lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

callmessagedelegate: keep same text color as other message

Browse source 
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
This commit is contained in:
Sébastien Blin 2023-05-26 09:33:41 -04:00
parent ac83334091
commit fa8fcd8786
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/commoncomponents/CallMessageDelegate.qml
View file

@ -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 {
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 {

1
src/app/commoncomponents/SBSMessageBase.qml
View file

@ -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) {