diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 8ab90c93..ae0a17cb 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -162,10 +162,6 @@ Singleton { "id": "Tray" }, { "id": "NotificationHistory" - }, { - "id": "WiFi" - }, { - "id": "Bluetooth" }, { "id": "Battery" }, { @@ -246,13 +242,17 @@ Singleton { property JsonObject controlCenter: JsonObject { // Position: close_to_bar_button, center, top_left, top_right, bottom_left, bottom_right, bottom_center, top_center property string position: "close_to_bar_button" - property string quickSettingsStyle: "modern" // "modern" or "classic" + property string quickSettingsStyle: "compact" // "modern", "classic", or "compact" property JsonObject widgets widgets: JsonObject { property list quickSettings: [{ + "id": "WiFi" + }, { "id": "Bluetooth" }, { - "id": "WiFi" + "id": "DoNotDisturb" + }, { + "id": "ScreenRecorder" }, { "id": "PowerProfile" }] diff --git a/Modules/ControlCenter/ControlCenterPanel.qml b/Modules/ControlCenter/ControlCenterPanel.qml index 014c9a88..4f76e029 100644 --- a/Modules/ControlCenter/ControlCenterPanel.qml +++ b/Modules/ControlCenter/ControlCenterPanel.qml @@ -11,7 +11,7 @@ NPanel { id: root preferredWidth: 440 - preferredHeight: topHeight + bottomHeight + Math.round(Style.marginL * scaling * 3) + preferredHeight: topHeight + bottomHeight + Math.round(Style.marginL * scaling * 3) panelKeyboardFocus: true readonly property int bottomHeight: Math.round(Math.max(196 * scaling)) @@ -19,14 +19,12 @@ NPanel { const columns = (Settings.data.controlCenter.quickSettingsStyle === "compact") ? 4 : 3 const rowsCount = Math.ceil(Settings.data.controlCenter.widgets.quickSettings.length / columns) - var buttonHeight; + var buttonHeight if (Settings.data.controlCenter.quickSettingsStyle === "classic") { buttonHeight = Style.baseWidgetSize - } - else if (Settings.data.controlCenter.quickSettingsStyle === "compact") { + } else if (Settings.data.controlCenter.quickSettingsStyle === "compact") { buttonHeight = Style.baseWidgetSize * 0.8 // Smaller for compact - } - else { + } else { buttonHeight = 56 } diff --git a/Modules/Settings/Tabs/ControlCenterTab.qml b/Modules/Settings/Tabs/ControlCenterTab.qml index 044f13c8..fbc968f9 100644 --- a/Modules/Settings/Tabs/ControlCenterTab.qml +++ b/Modules/Settings/Tabs/ControlCenterTab.qml @@ -52,7 +52,7 @@ ColumnLayout { "key": "compact", "name": I18n.tr("options.control-center.quickSettingsStyle.compact") }] - currentKey: Settings.data.controlCenter.quickSettingsStyle || "modern" + currentKey: Settings.data.controlCenter.quickSettingsStyle || "compact" onSelected: function (key) { Settings.data.controlCenter.quickSettingsStyle = key }