From 789354464de479fa953f2d5a236a1f6d969ca15b Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Thu, 9 Oct 2025 21:29:07 -0400 Subject: [PATCH] QuickSettings: minor layout tweaks --- Modules/ControlCenter/Cards/MediaCard.qml | 6 +++--- Modules/ControlCenter/Cards/TopCard.qml | 2 +- Modules/ControlCenter/ControlCenterPanel.qml | 2 +- Modules/ControlCenter/Widgets/Bluetooth.qml | 2 -- Modules/ControlCenter/Widgets/KeepAwake.qml | 2 -- Modules/ControlCenter/Widgets/NightLight.qml | 2 -- Modules/ControlCenter/Widgets/Notifications.qml | 2 -- Modules/ControlCenter/Widgets/PowerProfile.qml | 2 -- Modules/ControlCenter/Widgets/ScreenRecorder.qml | 2 -- Modules/ControlCenter/Widgets/WallpaperSelector.qml | 2 -- Modules/ControlCenter/Widgets/WiFi.qml | 2 -- Widgets/NQuickSetting.qml | 5 +++-- 12 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Modules/ControlCenter/Cards/MediaCard.qml b/Modules/ControlCenter/Cards/MediaCard.qml index 0781b984..4484e27f 100644 --- a/Modules/ControlCenter/Cards/MediaCard.qml +++ b/Modules/ControlCenter/Cards/MediaCard.qml @@ -84,7 +84,7 @@ NBox { anchors.fill: parent values: CavaService.values fillColor: Color.mPrimary - opacity: MediaService.trackArtUrl !== "" ? 0.4 : 0.8 + opacity: MediaService.trackArtUrl !== "" ? 0.5 : 0.8 } } @@ -94,7 +94,7 @@ NBox { anchors.fill: parent values: CavaService.values fillColor: Color.mPrimary - opacity: MediaService.trackArtUrl !== "" ? 0.4 : 0.8 + opacity: MediaService.trackArtUrl !== "" ? 0.5 : 0.8 } } @@ -104,7 +104,7 @@ NBox { anchors.fill: parent values: CavaService.values fillColor: Color.mPrimary - opacity: MediaService.trackArtUrl !== "" ? 0.4 : 0.8 + opacity: MediaService.trackArtUrl !== "" ? 0.5 : 0.8 } } } diff --git a/Modules/ControlCenter/Cards/TopCard.qml b/Modules/ControlCenter/Cards/TopCard.qml index 69f1bf5a..21b68eca 100644 --- a/Modules/ControlCenter/Cards/TopCard.qml +++ b/Modules/ControlCenter/Cards/TopCard.qml @@ -106,7 +106,7 @@ NBox { id: grid Layout.fillWidth: true columns: (Settings.data.controlCenter.quickSettingsStyle === "compact") ? 4 : 3 - columnSpacing: Style.marginM * scaling + columnSpacing: Style.marginS * scaling rowSpacing: Style.marginS * scaling Repeater { diff --git a/Modules/ControlCenter/ControlCenterPanel.qml b/Modules/ControlCenter/ControlCenterPanel.qml index 756dc1d6..e5b2145d 100644 --- a/Modules/ControlCenter/ControlCenterPanel.qml +++ b/Modules/ControlCenter/ControlCenterPanel.qml @@ -10,7 +10,7 @@ import qs.Widgets NPanel { id: root - preferredWidth: 360 + preferredWidth: 400 preferredHeight: topHeight + midHeight + bottomHeight + Math.round(Style.marginL * 4) panelKeyboardFocus: true diff --git a/Modules/ControlCenter/Widgets/Bluetooth.qml b/Modules/ControlCenter/Widgets/Bluetooth.qml index 9150004d..e9886a4f 100644 --- a/Modules/ControlCenter/Widgets/Bluetooth.qml +++ b/Modules/ControlCenter/Widgets/Bluetooth.qml @@ -9,8 +9,6 @@ NQuickSetting { property real scaling: 1.0 text: I18n.tr("quickSettings.bluetooth.label.enabled") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium icon: BluetoothService.enabled ? "bluetooth" : "bluetooth-off" tooltipText: I18n.tr("quickSettings.bluetooth.tooltip.action") style: Settings.data.controlCenter.quickSettingsStyle || "modern" diff --git a/Modules/ControlCenter/Widgets/KeepAwake.qml b/Modules/ControlCenter/Widgets/KeepAwake.qml index fff72489..044734e4 100644 --- a/Modules/ControlCenter/Widgets/KeepAwake.qml +++ b/Modules/ControlCenter/Widgets/KeepAwake.qml @@ -9,8 +9,6 @@ NQuickSetting { property real scaling: 1.0 text: I18n.tr("quickSettings.keepAwake.label.enabled") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium icon: IdleInhibitorService.isInhibited ? "keep-awake-on" : "keep-awake-off" hot: IdleInhibitorService.isInhibited tooltipText: I18n.tr("quickSettings.keepAwake.tooltip.action") diff --git a/Modules/ControlCenter/Widgets/NightLight.qml b/Modules/ControlCenter/Widgets/NightLight.qml index dac6dd98..19cdd669 100644 --- a/Modules/ControlCenter/Widgets/NightLight.qml +++ b/Modules/ControlCenter/Widgets/NightLight.qml @@ -10,8 +10,6 @@ NQuickSetting { enabled: ProgramCheckerService.wlsunsetAvailable text: I18n.tr("quickSettings.nightLight.label.enabled") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium icon: Settings.data.nightLight.enabled ? (Settings.data.nightLight.forced ? "nightlight-forced" : "nightlight-on") : "nightlight-off" hot: !Settings.data.nightLight.enabled || Settings.data.nightLight.forced style: Settings.data.controlCenter.quickSettingsStyle || "modern" diff --git a/Modules/ControlCenter/Widgets/Notifications.qml b/Modules/ControlCenter/Widgets/Notifications.qml index 7d8085e4..19c22a82 100644 --- a/Modules/ControlCenter/Widgets/Notifications.qml +++ b/Modules/ControlCenter/Widgets/Notifications.qml @@ -9,8 +9,6 @@ NQuickSetting { property real scaling: 1.0 text: Settings.data.notifications.doNotDisturb ? I18n.tr("quickSettings.notifications.label.disabled") : I18n.tr("quickSettings.notifications.label.enabled") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium icon: Settings.data.notifications.doNotDisturb ? "bell-off" : "bell" hot: Settings.data.notifications.doNotDisturb tooltipText: I18n.tr("quickSettings.notifications.tooltip.action") diff --git a/Modules/ControlCenter/Widgets/PowerProfile.qml b/Modules/ControlCenter/Widgets/PowerProfile.qml index 442cc9c5..1a504963 100644 --- a/Modules/ControlCenter/Widgets/PowerProfile.qml +++ b/Modules/ControlCenter/Widgets/PowerProfile.qml @@ -13,8 +13,6 @@ NQuickSetting { enabled: hasPP text: hasPP ? PowerProfileService.getName() : I18n.tr("quickSettings.powerProfile.label.unavailable") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium icon: PowerProfileService.getIcon() hot: !PowerProfileService.isDefault() tooltipText: I18n.tr("quickSettings.powerProfile.tooltip.action") diff --git a/Modules/ControlCenter/Widgets/ScreenRecorder.qml b/Modules/ControlCenter/Widgets/ScreenRecorder.qml index a53e3950..f9ad8786 100644 --- a/Modules/ControlCenter/Widgets/ScreenRecorder.qml +++ b/Modules/ControlCenter/Widgets/ScreenRecorder.qml @@ -11,8 +11,6 @@ NQuickSetting { enabled: ProgramCheckerService.gpuScreenRecorderAvailable icon: "camera-video" text: ScreenRecorderService.isRecording ? I18n.tr("quickSettings.screenRecorder.label.recording") : I18n.tr("quickSettings.screenRecorder.label.stopped") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium hot: ScreenRecorderService.isRecording tooltipText: I18n.tr("quickSettings.screenRecorder.tooltip.action") style: Settings.data.controlCenter.quickSettingsStyle || "modern" diff --git a/Modules/ControlCenter/Widgets/WallpaperSelector.qml b/Modules/ControlCenter/Widgets/WallpaperSelector.qml index e4531ecd..95a50af3 100644 --- a/Modules/ControlCenter/Widgets/WallpaperSelector.qml +++ b/Modules/ControlCenter/Widgets/WallpaperSelector.qml @@ -11,8 +11,6 @@ NQuickSetting { enabled: Settings.data.wallpaper.enabled icon: "wallpaper-selector" text: I18n.tr("quickSettings.wallpaperSelector.label") - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium tooltipText: I18n.tr("quickSettings.wallpaperSelector.tooltip.action") style: Settings.data.controlCenter.quickSettingsStyle || "modern" diff --git a/Modules/ControlCenter/Widgets/WiFi.qml b/Modules/ControlCenter/Widgets/WiFi.qml index 29c89a8a..7f739866 100644 --- a/Modules/ControlCenter/Widgets/WiFi.qml +++ b/Modules/ControlCenter/Widgets/WiFi.qml @@ -43,8 +43,6 @@ NQuickSetting { return connected ? I18n.tr("quickSettings.wifi.label.wifi") : I18n.tr("quickSettings.wifi.label.disconnected") } - fontSize: Style.fontSizeS * scaling - fontWeight: Style.fontWeightMedium style: Settings.data.controlCenter.quickSettingsStyle || "modern" tooltipText: I18n.tr("quickSettings.wifi.tooltip.action") onClicked: PanelService.getPanel("wifiPanel")?.toggle(this) diff --git a/Widgets/NQuickSetting.qml b/Widgets/NQuickSetting.qml index c5706cf9..7b559019 100644 --- a/Widgets/NQuickSetting.qml +++ b/Widgets/NQuickSetting.qml @@ -17,7 +17,7 @@ Rectangle { property string style: "modern" // "modern", "classic", or "compact" // Styling properties - property real fontSize: Style.fontSizeS * scaling + property real fontSize: (style === "classic") ? Style.fontSizeXS * scaling : Style.fontSizeS * scaling property int fontWeight: Style.fontWeightMedium property real iconSize: Style.fontSizeL * scaling property real cornerRadius: Style.radiusM * scaling @@ -171,7 +171,7 @@ Rectangle { } } - // Text content + // Modern - Text content NText { Layout.alignment: Qt.AlignHCenter visible: root.text !== "" @@ -245,6 +245,7 @@ Rectangle { } } + // Classic - Text content NText { visible: root.text !== "" text: root.text