diff --git a/Modules/SidePanel/Cards/PowerProfilesCard.qml b/Modules/SidePanel/Cards/PowerProfilesCard.qml index 63efa31..5dc895b 100644 --- a/Modules/SidePanel/Cards/PowerProfilesCard.qml +++ b/Modules/SidePanel/Cards/PowerProfilesCard.qml @@ -9,14 +9,12 @@ import qs.Widgets // Power Profiles: performance, balanced, eco NBox { - Layout.fillWidth: true - Layout.preferredWidth: 1 - implicitHeight: powerRow.implicitHeight + Style.marginM * 2 * scaling + + property real spacing: 0 // Centralized service readonly property bool hasPP: PowerProfileService.available - property real spacing: 0 - + RowLayout { id: powerRow anchors.fill: parent diff --git a/Modules/SidePanel/Cards/ProfileCard.qml b/Modules/SidePanel/Cards/ProfileCard.qml index 2d101f8..34bb0ce 100644 --- a/Modules/SidePanel/Cards/ProfileCard.qml +++ b/Modules/SidePanel/Cards/ProfileCard.qml @@ -16,10 +16,6 @@ NBox { property string uptimeText: "--" - Layout.fillWidth: true - // Height driven by content - implicitHeight: content.implicitHeight + Style.marginM * 2 * scaling - RowLayout { id: content anchors.left: parent.left diff --git a/Modules/SidePanel/Cards/SystemMonitorCard.qml b/Modules/SidePanel/Cards/SystemMonitorCard.qml index 9923612..e9b36d1 100644 --- a/Modules/SidePanel/Cards/SystemMonitorCard.qml +++ b/Modules/SidePanel/Cards/SystemMonitorCard.qml @@ -8,7 +8,7 @@ import qs.Widgets NBox { id: root - Layout.preferredWidth: Style.baseWidgetSize * 2.625 * scaling + ColumnLayout { id: content diff --git a/Modules/SidePanel/Cards/UtilitiesCard.qml b/Modules/SidePanel/Cards/UtilitiesCard.qml index 7ee8c31..0b9dbf9 100644 --- a/Modules/SidePanel/Cards/UtilitiesCard.qml +++ b/Modules/SidePanel/Cards/UtilitiesCard.qml @@ -12,9 +12,7 @@ NBox { property real spacing: 0 - Layout.fillWidth: true - Layout.preferredWidth: 1 - implicitHeight: utilRow.implicitHeight + Style.marginM * 2 * scaling + RowLayout { id: utilRow anchors.fill: parent diff --git a/Modules/SidePanel/Cards/WeatherCard.qml b/Modules/SidePanel/Cards/WeatherCard.qml index 5f3f137..34a8f2c 100644 --- a/Modules/SidePanel/Cards/WeatherCard.qml +++ b/Modules/SidePanel/Cards/WeatherCard.qml @@ -11,11 +11,6 @@ NBox { readonly property bool weatherReady: (LocationService.data.weather !== null) - // TBC weatherReady is not turning to false when we reset weather... - Layout.fillWidth: true - // Height driven by content - implicitHeight: content.implicitHeight + Style.marginL * 2 * scaling - ColumnLayout { id: content anchors.left: parent.left diff --git a/Modules/SidePanel/SidePanel.qml b/Modules/SidePanel/SidePanel.qml index 6adfe58..688efd8 100644 --- a/Modules/SidePanel/SidePanel.qml +++ b/Modules/SidePanel/SidePanel.qml @@ -11,7 +11,7 @@ NPanel { id: root preferredWidth: 460 - preferredHeight: 730 + preferredHeight: 734 panelContent: Item { id: content @@ -29,10 +29,12 @@ NPanel { // Cards (consistent inter-card spacing via ColumnLayout spacing) ProfileCard { Layout.fillWidth: true + Layout.preferredHeight: Math.max(64 * scaling) } WeatherCard { Layout.fillWidth: true + Layout.preferredHeight: Math.max(220 * scaling) } // Middle section: media + stats column @@ -49,6 +51,7 @@ NPanel { // System monitors combined in one card SystemMonitorCard { + Layout.preferredWidth: Style.baseWidgetSize * 2.625 * scaling Layout.fillHeight: true } } @@ -61,14 +64,16 @@ NPanel { // Power Profiles switcher PowerProfilesCard { - spacing: content.cardSpacing Layout.fillWidth: true + Layout.fillHeight: true + spacing: content.cardSpacing } // Utilities buttons UtilitiesCard { - spacing: content.cardSpacing Layout.fillWidth: true + Layout.fillHeight: true + spacing: content.cardSpacing } } }