From 8285961c429725aaf4f5e2ae1c306cc639d5819c Mon Sep 17 00:00:00 2001 From: James Graham Date: Mon, 11 Sep 2023 07:19:32 +0000 Subject: [PATCH] Restore compact mode background Restore compact mode using the darker/lighter depending on color scheme background (i.e. the same as the bubble background) it broke somewhere in the refactor of roompage --- src/qml/Component/Timeline/StateDelegate.qml | 1 + src/qml/Component/TimelineView.qml | 1 + src/qml/Page/RoomPage.qml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/qml/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml index dc03d437a..c9b074c92 100644 --- a/src/qml/Component/Timeline/StateDelegate.qml +++ b/src/qml/Component/Timeline/StateDelegate.qml @@ -62,6 +62,7 @@ QQC2.Control { Layout.fillWidth: true visible: sectionVisible labelText: sectionVisible ? section : "" + colorSet: Config.compactLayout ? Kirigami.Theme.View : Kirigami.Theme.Window } RowLayout { Layout.fillWidth: true diff --git a/src/qml/Component/TimelineView.qml b/src/qml/Component/TimelineView.qml index 001101707..7b7ae044c 100644 --- a/src/qml/Component/TimelineView.qml +++ b/src/qml/Component/TimelineView.qml @@ -116,6 +116,7 @@ QQC2.ScrollView { z: 3 visible: !!messageListView.sectionBannerItem && messageListView.sectionBannerItem.ListView.section !== "" && !Config.blur labelText: messageListView.sectionBannerItem ? messageListView.sectionBannerItem.ListView.section : "" + colorSet: Config.compactLayout ? Kirigami.Theme.View : Kirigami.Theme.Window } footerPositioning: ListView.OverlayHeader diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml index 96b0d5694..57cc9993e 100644 --- a/src/qml/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -97,6 +97,8 @@ Kirigami.Page { } background: Rectangle { + Kirigami.Theme.colorSet: Kirigami.Theme.View + Kirigami.Theme.inherit: false color: Config.compactLayout ? Kirigami.Theme.backgroundColor : "transparent" }