diff options
| -rw-r--r-- | components/SectionContainer.qml | 4 | ||||
| -rw-r--r-- | components/controls/CollapsibleSection.qml | 5 | ||||
| -rw-r--r-- | modules/controlcenter/appearance/AppearancePane.qml | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/components/SectionContainer.qml b/components/SectionContainer.qml index 60e3d59..f133e19 100644 --- a/components/SectionContainer.qml +++ b/components/SectionContainer.qml @@ -16,7 +16,9 @@ StyledRect { implicitHeight: contentColumn.implicitHeight + Appearance.padding.large * 2 radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + color: Colours.transparency.enabled + ? Colours.layer(Colours.palette.m3surfaceContainer, 2) + : Colours.palette.m3surfaceContainerHigh ColumnLayout { id: contentColumn diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index 078145b..8940884 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -13,6 +13,7 @@ ColumnLayout { property string description: "" property bool expanded: false property bool showBackground: false + property bool nested: false signal toggleRequested @@ -87,7 +88,9 @@ ColumnLayout { id: backgroundRect anchors.fill: parent radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + color: Colours.transparency.enabled + ? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2) + : (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer) opacity: root.showBackground && root.expanded ? 1.0 : 0.0 visible: root.showBackground diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml index 891f64b..61cdcaa 100644 --- a/modules/controlcenter/appearance/AppearancePane.qml +++ b/modules/controlcenter/appearance/AppearancePane.qml @@ -524,6 +524,7 @@ RowLayout { title: qsTr("Material font family") expanded: true showBackground: true + nested: true Loader { id: materialFontLoader @@ -606,6 +607,7 @@ RowLayout { title: qsTr("Monospace font family") expanded: false showBackground: true + nested: true Loader { Layout.fillWidth: true @@ -686,6 +688,7 @@ RowLayout { title: qsTr("Sans-serif font family") expanded: false showBackground: true + nested: true Loader { Layout.fillWidth: true |