diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2026-01-28 19:21:44 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2026-01-28 19:21:44 +1100 |
| commit | 9d7f0c48cebec02aaf2ca780b89a763ce91f8624 (patch) | |
| tree | 2345921b670f730268203020e754465503707ed3 /modules/controlcenter/taskbar | |
| parent | controlcenter: remove qt5compat dep (diff) | |
| download | caelestia-shell-9d7f0c48cebec02aaf2ca780b89a763ce91f8624.tar.gz caelestia-shell-9d7f0c48cebec02aaf2ca780b89a763ce91f8624.tar.bz2 caelestia-shell-9d7f0c48cebec02aaf2ca780b89a763ce91f8624.zip | |
internal: format
Diffstat (limited to 'modules/controlcenter/taskbar')
| -rw-r--r-- | modules/controlcenter/taskbar/ConnectedButtonGroup.qml | 9 | ||||
| -rw-r--r-- | modules/controlcenter/taskbar/TaskbarPane.qml | 294 |
2 files changed, 152 insertions, 151 deletions
diff --git a/modules/controlcenter/taskbar/ConnectedButtonGroup.qml b/modules/controlcenter/taskbar/ConnectedButtonGroup.qml index bf3a97f..01cd612 100644 --- a/modules/controlcenter/taskbar/ConnectedButtonGroup.qml +++ b/modules/controlcenter/taskbar/ConnectedButtonGroup.qml @@ -53,9 +53,9 @@ StyledRect { Layout.fillWidth: true text: modelData.label - + property bool _checked: false - + checked: _checked toggle: false type: TextButton.Tonal @@ -65,7 +65,7 @@ StyledRect { if (root.rootItem && modelData.propertyName) { const propName = modelData.propertyName; const rootItem = root.rootItem; - _checked = Qt.binding(function() { + _checked = Qt.binding(function () { return rootItem[propName] ?? false; }); } @@ -77,7 +77,7 @@ StyledRect { // Match utilities Toggles inactive color inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) - + // Adjust width similar to utilities toggles Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Appearance.padding.large : internalChecked ? Appearance.padding.smaller : 0) @@ -106,4 +106,3 @@ StyledRect { } } } - diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml index 917b73a..d12d174 100644 --- a/modules/controlcenter/taskbar/TaskbarPane.qml +++ b/modules/controlcenter/taskbar/TaskbarPane.qml @@ -183,7 +183,7 @@ Item { { label: qsTr("Speakers"), propertyName: "showAudio", - onToggled: function(checked) { + onToggled: function (checked) { root.showAudio = checked; root.saveConfig(); } @@ -191,7 +191,7 @@ Item { { label: qsTr("Microphone"), propertyName: "showMicrophone", - onToggled: function(checked) { + onToggled: function (checked) { root.showMicrophone = checked; root.saveConfig(); } @@ -199,7 +199,7 @@ Item { { label: qsTr("Keyboard"), propertyName: "showKbLayout", - onToggled: function(checked) { + onToggled: function (checked) { root.showKbLayout = checked; root.saveConfig(); } @@ -207,7 +207,7 @@ Item { { label: qsTr("Network"), propertyName: "showNetwork", - onToggled: function(checked) { + onToggled: function (checked) { root.showNetwork = checked; root.saveConfig(); } @@ -215,7 +215,7 @@ Item { { label: qsTr("Wifi"), propertyName: "showWifi", - onToggled: function(checked) { + onToggled: function (checked) { root.showWifi = checked; root.saveConfig(); } @@ -223,7 +223,7 @@ Item { { label: qsTr("Bluetooth"), propertyName: "showBluetooth", - onToggled: function(checked) { + onToggled: function (checked) { root.showBluetooth = checked; root.saveConfig(); } @@ -231,7 +231,7 @@ Item { { label: qsTr("Battery"), propertyName: "showBattery", - onToggled: function(checked) { + onToggled: function (checked) { root.showBattery = checked; root.saveConfig(); } @@ -239,7 +239,7 @@ Item { { label: qsTr("Capslock"), propertyName: "showLockStatus", - onToggled: function(checked) { + onToggled: function (checked) { root.showLockStatus = checked; root.saveConfig(); } @@ -268,173 +268,173 @@ Item { font.pointSize: Appearance.font.size.normal } - StyledRect { - Layout.fillWidth: true - implicitHeight: workspacesShownRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + StyledRect { + Layout.fillWidth: true + implicitHeight: workspacesShownRow.implicitHeight + Appearance.padding.large * 2 + radius: Appearance.rounding.normal + color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - Behavior on implicitHeight { - Anim {} - } + Behavior on implicitHeight { + Anim {} + } - RowLayout { - id: workspacesShownRow - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + RowLayout { + id: workspacesShownRow + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.margins: Appearance.padding.large + spacing: Appearance.spacing.normal - StyledText { - Layout.fillWidth: true - text: qsTr("Shown") - } + StyledText { + Layout.fillWidth: true + text: qsTr("Shown") + } - CustomSpinBox { - min: 1 - max: 20 - value: root.workspacesShown - onValueModified: value => { - root.workspacesShown = value; - root.saveConfig(); + CustomSpinBox { + min: 1 + max: 20 + value: root.workspacesShown + onValueModified: value => { + root.workspacesShown = value; + root.saveConfig(); + } } } } - } - StyledRect { - Layout.fillWidth: true - implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + StyledRect { + Layout.fillWidth: true + implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Appearance.padding.large * 2 + radius: Appearance.rounding.normal + color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - Behavior on implicitHeight { - Anim {} - } + Behavior on implicitHeight { + Anim {} + } - RowLayout { - id: workspacesActiveIndicatorRow - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + RowLayout { + id: workspacesActiveIndicatorRow + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.margins: Appearance.padding.large + spacing: Appearance.spacing.normal - StyledText { - Layout.fillWidth: true - text: qsTr("Active indicator") - } + StyledText { + Layout.fillWidth: true + text: qsTr("Active indicator") + } - StyledSwitch { - checked: root.workspacesActiveIndicator - onToggled: { - root.workspacesActiveIndicator = checked; - root.saveConfig(); + StyledSwitch { + checked: root.workspacesActiveIndicator + onToggled: { + root.workspacesActiveIndicator = checked; + root.saveConfig(); + } } } } - } - StyledRect { - Layout.fillWidth: true - implicitHeight: workspacesOccupiedBgRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + StyledRect { + Layout.fillWidth: true + implicitHeight: workspacesOccupiedBgRow.implicitHeight + Appearance.padding.large * 2 + radius: Appearance.rounding.normal + color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - Behavior on implicitHeight { - Anim {} - } + Behavior on implicitHeight { + Anim {} + } - RowLayout { - id: workspacesOccupiedBgRow - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + RowLayout { + id: workspacesOccupiedBgRow + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.margins: Appearance.padding.large + spacing: Appearance.spacing.normal - StyledText { - Layout.fillWidth: true - text: qsTr("Occupied background") - } + StyledText { + Layout.fillWidth: true + text: qsTr("Occupied background") + } - StyledSwitch { - checked: root.workspacesOccupiedBg - onToggled: { - root.workspacesOccupiedBg = checked; - root.saveConfig(); + StyledSwitch { + checked: root.workspacesOccupiedBg + onToggled: { + root.workspacesOccupiedBg = checked; + root.saveConfig(); + } } } } - } - StyledRect { - Layout.fillWidth: true - implicitHeight: workspacesShowWindowsRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + StyledRect { + Layout.fillWidth: true + implicitHeight: workspacesShowWindowsRow.implicitHeight + Appearance.padding.large * 2 + radius: Appearance.rounding.normal + color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - Behavior on implicitHeight { - Anim {} - } + Behavior on implicitHeight { + Anim {} + } - RowLayout { - id: workspacesShowWindowsRow - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + RowLayout { + id: workspacesShowWindowsRow + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.margins: Appearance.padding.large + spacing: Appearance.spacing.normal - StyledText { - Layout.fillWidth: true - text: qsTr("Show windows") - } + StyledText { + Layout.fillWidth: true + text: qsTr("Show windows") + } - StyledSwitch { - checked: root.workspacesShowWindows - onToggled: { - root.workspacesShowWindows = checked; - root.saveConfig(); + StyledSwitch { + checked: root.workspacesShowWindows + onToggled: { + root.workspacesShowWindows = checked; + root.saveConfig(); + } } } } - } - StyledRect { - Layout.fillWidth: true - implicitHeight: workspacesPerMonitorRow.implicitHeight + Appearance.padding.large * 2 - radius: Appearance.rounding.normal - color: Colours.layer(Colours.palette.m3surfaceContainer, 2) + StyledRect { + Layout.fillWidth: true + implicitHeight: workspacesPerMonitorRow.implicitHeight + Appearance.padding.large * 2 + radius: Appearance.rounding.normal + color: Colours.layer(Colours.palette.m3surfaceContainer, 2) - Behavior on implicitHeight { - Anim {} - } + Behavior on implicitHeight { + Anim {} + } - RowLayout { - id: workspacesPerMonitorRow - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.margins: Appearance.padding.large - spacing: Appearance.spacing.normal + RowLayout { + id: workspacesPerMonitorRow + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.margins: Appearance.padding.large + spacing: Appearance.spacing.normal - StyledText { - Layout.fillWidth: true - text: qsTr("Per monitor workspaces") - } + StyledText { + Layout.fillWidth: true + text: qsTr("Per monitor workspaces") + } - StyledSwitch { - checked: root.workspacesPerMonitor - onToggled: { - root.workspacesPerMonitor = checked; - root.saveConfig(); + StyledSwitch { + checked: root.workspacesPerMonitor + onToggled: { + root.workspacesPerMonitor = checked; + root.saveConfig(); + } } } } } - } SectionContainer { Layout.fillWidth: true @@ -452,7 +452,7 @@ Item { { label: qsTr("Workspaces"), propertyName: "scrollWorkspaces", - onToggled: function(checked) { + onToggled: function (checked) { root.scrollWorkspaces = checked; root.saveConfig(); } @@ -460,7 +460,7 @@ Item { { label: qsTr("Volume"), propertyName: "scrollVolume", - onToggled: function(checked) { + onToggled: function (checked) { root.scrollVolume = checked; root.saveConfig(); } @@ -468,7 +468,7 @@ Item { { label: qsTr("Brightness"), propertyName: "scrollBrightness", - onToggled: function(checked) { + onToggled: function (checked) { root.scrollBrightness = checked; root.saveConfig(); } @@ -541,11 +541,14 @@ Item { from: 0 to: 100 suffix: "px" - validator: IntValidator { bottom: 0; top: 100 } - formatValueFunction: (val) => Math.round(val).toString() - parseValueFunction: (text) => parseInt(text) + validator: IntValidator { + bottom: 0 + top: 100 + } + formatValueFunction: val => Math.round(val).toString() + parseValueFunction: text => parseInt(text) - onValueModified: (newValue) => { + onValueModified: newValue => { root.dragThreshold = Math.round(newValue); root.saveConfig(); } @@ -613,7 +616,7 @@ Item { { label: qsTr("Background"), propertyName: "trayBackground", - onToggled: function(checked) { + onToggled: function (checked) { root.trayBackground = checked; root.saveConfig(); } @@ -621,7 +624,7 @@ Item { { label: qsTr("Compact"), propertyName: "trayCompact", - onToggled: function(checked) { + onToggled: function (checked) { root.trayCompact = checked; root.saveConfig(); } @@ -629,7 +632,7 @@ Item { { label: qsTr("Recolour"), propertyName: "trayRecolour", - onToggled: function(checked) { + onToggled: function (checked) { root.trayRecolour = checked; root.saveConfig(); } @@ -639,7 +642,6 @@ Item { } } } - } } } |