From e00ce79d264236c6936655cae0d9251375e8c589 Mon Sep 17 00:00:00 2001 From: James Graham Date: Sat, 1 Apr 2023 09:49:04 +0100 Subject: [PATCH] Change the background colour in compact mode to achieve the same level of contrast as with bubbles. --- .../Component/Timeline/SectionDelegate.qml | 2 +- src/qml/Page/RoomPage.qml | 59 ++++++++++--------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/qml/Component/Timeline/SectionDelegate.qml b/src/qml/Component/Timeline/SectionDelegate.qml index a8ecc047e..127fd0328 100644 --- a/src/qml/Component/Timeline/SectionDelegate.qml +++ b/src/qml/Component/Timeline/SectionDelegate.qml @@ -42,6 +42,6 @@ QQC2.ItemDelegate { background: Rectangle { color: Config.blur ? "transparent" : Kirigami.Theme.backgroundColor Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: Kirigami.Theme.Window + Kirigami.Theme.colorSet: Config.compactLayout ? Kirigami.Theme.View : Kirigami.Theme.Window } } diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml index 20e3978a2..9998df0ee 100644 --- a/src/qml/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -581,37 +581,42 @@ Kirigami.ScrollablePage { } } - background: FancyEffectsContainer { - id: fancyEffectsContainer - z: 100 + background: Rectangle { + color: Config.compactLayout ? Kirigami.Theme.backgroundColor : "transparent" - enabled: Config.showFancyEffects + FancyEffectsContainer { + id: fancyEffectsContainer + anchors.fill: parent + z: 100 - function processFancyEffectsReason(fancyEffect) { - if (fancyEffect === "snowflake") { - fancyEffectsContainer.showSnowEffect() - } - if (fancyEffect === "fireworks") { - fancyEffectsContainer.showFireworksEffect() - } - if (fancyEffect === "confetti") { - fancyEffectsContainer.showConfettiEffect() - } - } - - Connections { enabled: Config.showFancyEffects - target: messageEventModel - function onFancyEffectsReasonFound(fancyEffect) { - fancyEffectsContainer.processFancyEffectsReason(fancyEffect) - } - } - Connections { - enabled: Config.showFancyEffects - target: actionsHandler - function onShowEffect(fancyEffect) { - fancyEffectsContainer.processFancyEffectsReason(fancyEffect) + function processFancyEffectsReason(fancyEffect) { + if (fancyEffect === "snowflake") { + fancyEffectsContainer.showSnowEffect() + } + if (fancyEffect === "fireworks") { + fancyEffectsContainer.showFireworksEffect() + } + if (fancyEffect === "confetti") { + fancyEffectsContainer.showConfettiEffect() + } + } + + Connections { + enabled: Config.showFancyEffects + target: messageEventModel + function onFancyEffectsReasonFound(fancyEffect) { + fancyEffectsContainer.processFancyEffectsReason(fancyEffect) + } + } + + Connections { + enabled: Config.showFancyEffects + target: actionsHandler + function onShowEffect(fancyEffect) { + fancyEffectsContainer.processFancyEffectsReason(fancyEffect) + } } } }