diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-08-17 16:06:38 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-08-17 16:06:38 +1000 |
| commit | 5c93d07a8e8b4c0b4cea76a5f4d259a08c1c277a (patch) | |
| tree | a312e33f38e463c0ccef5c76199fbb9c18cca9f5 /modules/controlcenter/bluetooth | |
| parent | lock: refactor (diff) | |
| download | caelestia-shell-5c93d07a8e8b4c0b4cea76a5f4d259a08c1c277a.tar.gz caelestia-shell-5c93d07a8e8b4c0b4cea76a5f4d259a08c1c277a.tar.bz2 caelestia-shell-5c93d07a8e8b4c0b4cea76a5f4d259a08c1c277a.zip | |
internal: scale rounding properly
Diffstat (limited to 'modules/controlcenter/bluetooth')
| -rw-r--r-- | modules/controlcenter/bluetooth/Details.qml | 2 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/DeviceList.qml | 4 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/Settings.qml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index 7a7d6c3..d3df798 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -265,7 +265,7 @@ Item { implicitWidth: implicitHeight implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 - radius: root.session.bt.editingDeviceName ? Appearance.rounding.small : implicitHeight / 2 + radius: root.session.bt.editingDeviceName ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0) StateLayer { diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index 3435d84..bfbfd9c 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -113,7 +113,7 @@ ColumnLayout { implicitWidth: implicitHeight implicitHeight: scanIcon.implicitHeight + Appearance.padding.normal * 2 - radius: Bluetooth.defaultAdapter?.discovering ? Appearance.rounding.normal : implicitHeight / 2 + radius: Bluetooth.defaultAdapter?.discovering ? Appearance.rounding.normal : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: Bluetooth.defaultAdapter?.discovering ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer StateLayer { @@ -290,7 +290,7 @@ ColumnLayout { implicitWidth: toggleBtnInner.implicitWidth + Appearance.padding.large * 2 implicitHeight: toggleBtnIcon.implicitHeight + Appearance.padding.normal * 2 - radius: toggled || toggleStateLayer.pressed ? Appearance.rounding.small : Math.min(width, height) / 2 + radius: toggled || toggleStateLayer.pressed ? Appearance.rounding.small : Math.min(width, height) / 2 * Math.min(1, Appearance.rounding.scale) color: toggled ? Colours.palette[`m3${accent.toLowerCase()}`] : Colours.palette[`m3${accent.toLowerCase()}Container`] StateLayer { diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index 6c51ee7..1b2511d 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -425,7 +425,7 @@ ColumnLayout { implicitWidth: implicitHeight implicitHeight: editIcon.implicitHeight + Appearance.padding.smaller * 2 - radius: root.session.bt.editingAdapterName ? Appearance.rounding.small : implicitHeight / 2 + radius: root.session.bt.editingAdapterName ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0) StateLayer { |