From b525a53c8b94d8dd1acd88f99c6446eca3ee9cf2 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Thu, 2 Oct 2025 18:01:17 -0400 Subject: [PATCH] ColorScheme: reducing overall height by using a more compact NCollapsible --- Modules/Settings/Tabs/ColorSchemeTab.qml | 2 +- Widgets/NCollapsible.qml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml index 36c6318f..866e5616 100644 --- a/Modules/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Settings/Tabs/ColorSchemeTab.qml @@ -217,6 +217,7 @@ ColumnLayout { ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme) } } + Layout.bottomMargin: Style.marginL * scaling } // Color Schemes Grid @@ -415,7 +416,6 @@ ColumnLayout { Layout.fillWidth: true Layout.topMargin: Style.marginXL * scaling Layout.bottomMargin: Style.marginXL * scaling - visible: Settings.data.colorSchemes.useWallpaperColors } // Matugen template toggles organized by category diff --git a/Widgets/NCollapsible.qml b/Widgets/NCollapsible.qml index 2efd3f01..4960ba10 100644 --- a/Widgets/NCollapsible.qml +++ b/Widgets/NCollapsible.qml @@ -21,7 +21,7 @@ ColumnLayout { Rectangle { id: headerContainer Layout.fillWidth: true - Layout.preferredHeight: headerContent.implicitHeight + (Style.marginL * scaling * 2) + Layout.preferredHeight: headerContent.implicitHeight + (Style.marginM * scaling * 2) // Material 3 style background color: root.expanded ? Color.mSecondary : Color.mSurfaceVariant @@ -75,7 +75,7 @@ ColumnLayout { RowLayout { id: headerContent anchors.fill: parent - anchors.margins: Style.marginL * scaling + anchors.margins: Style.marginM * scaling spacing: Style.marginM * scaling // Expand/collapse icon with rotation animation @@ -102,17 +102,16 @@ ColumnLayout { } // Header text content - properly contained - ColumnLayout { + RowLayout { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter - spacing: Style.marginXXS * scaling + spacing: Style.marginL * scaling NText { text: root.label pointSize: Style.fontSizeL * scaling font.weight: Style.fontWeightSemiBold color: root.expanded ? Color.mOnSecondary : Color.mOnSurface - Layout.fillWidth: true wrapMode: Text.WordWrap Behavior on color {