diff --git a/src/gui/Pages/Chat/Timeline/EventContent.qml b/src/gui/Pages/Chat/Timeline/EventContent.qml index e060aea1..7df3f39c 100644 --- a/src/gui/Pages/Chat/Timeline/EventContent.qml +++ b/src/gui/Pages/Chat/Timeline/EventContent.qml @@ -229,8 +229,8 @@ HRowLayout { z: -100 color: eventDelegate.checked && ! contentLabel.selectedText && - ! mousePointHandler.active? - "lightseagreen" : // XXX + ! mousePointHandler.active ? + theme.chat.message.checkedBackground : isOwn? theme.chat.message.ownBackground : diff --git a/src/gui/Pages/Chat/Timeline/EventFile.qml b/src/gui/Pages/Chat/Timeline/EventFile.qml index cda0f42b..6742af3f 100644 --- a/src/gui/Pages/Chat/Timeline/EventFile.qml +++ b/src/gui/Pages/Chat/Timeline/EventFile.qml @@ -49,7 +49,9 @@ HTile { Binding on backgroundColor { - value: "blue" // XXX + value: theme.chat.message.checkedBackground when: eventDelegate.checked } + + Behavior on backgroundColor { HColorAnimation {} } } diff --git a/src/gui/Pages/Chat/Timeline/EventImage.qml b/src/gui/Pages/Chat/Timeline/EventImage.qml index 2c13119b..d2b6c795 100644 --- a/src/gui/Pages/Chat/Timeline/EventImage.qml +++ b/src/gui/Pages/Chat/Timeline/EventImage.qml @@ -130,9 +130,13 @@ HMxcImage { Rectangle { anchors.fill: parent - visible: eventDelegate.checked - // XXX - color: "blue" - opacity: 0.2 + visible: opacity > 0 + color: theme.chat.message.checkedBackground + opacity: + eventDelegate.checked ? + theme.chat.message.thumbnailCheckedOverlayOpacity : + 0 + + Behavior on opacity { HNumberAnimation {} } } } diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl index fb878f36..5aceb69b 100644 --- a/src/themes/Glass.qpl +++ b/src/themes/Glass.qpl @@ -345,6 +345,7 @@ chat: color background: colors.mediumBackground color ownBackground: colors.strongBackground + color checkedBackground: colors.accentBackground color body: colors.text color date: colors.dimText @@ -394,6 +395,8 @@ chat: // by default 0.4 for 40%. real thumbnailMaxHeightRatio: 0.4 * Math.min(1, uiScale) + real thumbnailCheckedOverlayOpacity: 0.4 + daybreak: color background: colors.mediumBackground color text: colors.text diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl index 1577de28..41fe014c 100644 --- a/src/themes/Midnight.qpl +++ b/src/themes/Midnight.qpl @@ -47,7 +47,7 @@ colors: color strongBackground: hsluv(hue, bgSaturation * 2, intensity, opacity) - color accentBackground: hsluv(hue, saturation, intensity * 32, 1) + color accentBackground: hsluv(hue, saturation, intensity * 40, 1) color accentElement: hsluv(hue, saturation * 1.5, intensity * 52, 1) color strongAccentElement: hsluv(hue, saturation * 1.5, intensity * 72, 1) @@ -356,8 +356,9 @@ chat: int horizontalSpacing: theme.spacing / 1.25 int verticalSpacing: theme.spacing / 1.75 - color background: colors.weakBackground - color ownBackground: colors.mediumBackground + color background: colors.weakBackground + color ownBackground: colors.mediumBackground + color checkedBackground: colors.accentBackground color body: colors.text color date: colors.dimText @@ -407,6 +408,8 @@ chat: // by default 0.4 for 40%. real thumbnailMaxHeightRatio: 0.4 * Math.min(1, uiScale) + real thumbnailCheckedOverlayOpacity: 0.4 + daybreak: color background: colors.mediumBackground color text: colors.text