1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 14:55:43 +02:00

fix: Files messages hard to see

Files message color now adapt to bubble color

Change-Id: I2841b5c50a687bad702813fe1bf7ed1fc079a92b
Gitlab: #764
This commit is contained in:
Nicolas Vengeon 2022-12-07 12:03:57 -05:00
parent 38748efbc2
commit 19011c10bd

View file

@ -134,6 +134,9 @@ Loader {
Layout.leftMargin: 12 Layout.leftMargin: 12
Layout.preferredWidth: 24 Layout.preferredWidth: 24
Layout.preferredHeight: 24 Layout.preferredHeight: 24
color: UtilsAdapter.luma(bubble.color)
? JamiTheme.chatviewTextColorLight
: JamiTheme.chatviewTextColorDark
} }
} }
Component { Component {
@ -176,6 +179,7 @@ Loader {
spacing: 6 spacing: 6
TextEdit { TextEdit {
id: transferName id: transferName
width: Math.min(implicitWidth, maxMsgWidth) width: Math.min(implicitWidth, maxMsgWidth)
topPadding: 10 topPadding: 10
text: CurrentConversation.isSwarm ? text: CurrentConversation.isSwarm ?
@ -186,9 +190,9 @@ Loader {
font.pointSize: 11 font.pointSize: 11
renderType: Text.NativeRendering renderType: Text.NativeRendering
readOnly: true readOnly: true
color: isOutgoing ? color: UtilsAdapter.luma(bubble.color)
JamiTheme.messageOutTxtColor : ? JamiTheme.chatviewTextColorLight
JamiTheme.messageInTxtColor : JamiTheme.chatviewTextColorDark
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: canOpen ? cursorShape: canOpen ?
@ -204,6 +208,7 @@ Loader {
} }
Label { Label {
id: transferInfo id: transferInfo
width: Math.min(implicitWidth, maxMsgWidth) width: Math.min(implicitWidth, maxMsgWidth)
bottomPadding: 10 bottomPadding: 10
text: { text: {
@ -221,14 +226,15 @@ Loader {
wrapMode: Label.WrapAtWordBoundaryOrAnywhere wrapMode: Label.WrapAtWordBoundaryOrAnywhere
font.pointSize: 10 font.pointSize: 10
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: Qt.lighter((isOutgoing ? color: UtilsAdapter.luma(bubble.color)
JamiTheme.messageOutTxtColor : ? JamiTheme.chatviewTextColorLight
JamiTheme.messageInTxtColor), 1.5) : JamiTheme.chatviewTextColorDark
} }
} }
} }
,ProgressBar { ,ProgressBar {
id: progressBar id: progressBar
visible: Status === Interaction.Status.TRANSFER_ONGOING visible: Status === Interaction.Status.TRANSFER_ONGOING
height: visible * implicitHeight height: visible * implicitHeight
value: transferStats.progress / transferStats.totalSize value: transferStats.progress / transferStats.totalSize
@ -259,6 +265,7 @@ Loader {
innerContent.children: [ innerContent.children: [
Loader { Loader {
id: localMediaCompLoader id: localMediaCompLoader
anchors.right: isOutgoing ? parent.right : undefined anchors.right: isOutgoing ? parent.right : undefined
asynchronous: true asynchronous: true
width: sourceComponent.width width: sourceComponent.width
@ -272,6 +279,7 @@ Loader {
} }
Component { Component {
id: avComp id: avComp
Loader { Loader {
Component.onCompleted: { Component.onCompleted: {
var qml = WITH_WEBENGINE ? var qml = WITH_WEBENGINE ?
@ -285,6 +293,7 @@ Loader {
id: animatedImageComp id: animatedImageComp
AnimatedImage { AnimatedImage {
id: animatedImg id: animatedImg
anchors.right: isOutgoing ? parent.right : undefined anchors.right: isOutgoing ? parent.right : undefined
property real minSize: 192 property real minSize: 192
property real maxSize: 256 property real maxSize: 256