nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: migrate to new rounding tokens

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-20 18:19:32 +10:00
parent 53f88d2698
commit 711587d193
88 changed files with 183 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/SectionContainer.qml
View file

@ -14,7 +14,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: contentColumn.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh
ColumnLayout {

4
components/controls/CollapsibleSection.qml
View file

@ -63,7 +63,7 @@ ColumnLayout {
StateLayer {
anchors.fill: parent
color: Colours.palette.m3onSurface
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
showHoverBackground: false
onClicked: {
root.toggleRequested();
@ -87,7 +87,7 @@ ColumnLayout {
id: backgroundRect
anchors.fill: parent
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer)
opacity: root.showBackground && root.expanded ? 1.0 : 0.0
visible: root.showBackground

6
components/controls/CustomSpinBox.qml
View file

@ -79,13 +79,13 @@ RowLayout {
background: StyledRect {
implicitWidth: 100
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainerHigh
}
}
StyledRect {
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.palette.m3primary
implicitWidth: implicitHeight
@ -120,7 +120,7 @@ RowLayout {
}
StyledRect {
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.palette.m3primary
implicitWidth: implicitHeight

2
components/controls/IconButton.qml
View file

@ -44,7 +44,7 @@ StyledRect {
onCheckedChanged: internalChecked = checked
radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
implicitWidth: implicitHeight

2
components/controls/IconTextButton.qml
View file

@ -36,7 +36,7 @@ StyledRect {
onCheckedChanged: internalChecked = checked
radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: type === IconTextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour
implicitWidth: row.implicitWidth + horizontalPadding * 2

12
components/controls/Menu.qml
View file

@ -79,7 +79,7 @@ MouseArea {
return item.mapToItem(root.parent, 0, off).y + root.marginY;
}
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
level: 2
implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
@ -124,11 +124,11 @@ MouseArea {
implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.normal * 2
implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.normal * 2
radius: active ? 12 : Tokens.rounding.extraSmall // This should use a token, but tokens are currently extremely scuffed
topLeftRadius: index === 0 ? Tokens.rounding.small : radius
topRightRadius: index === 0 ? Tokens.rounding.small : radius
bottomLeftRadius: index === repeater.count - 1 ? Tokens.rounding.small : radius
bottomRightRadius: index === repeater.count - 1 ? Tokens.rounding.small : radius
radius: active ? Tokens.rounding.medium : Tokens.rounding.extraSmall
topLeftRadius: index === 0 ? Tokens.rounding.medium : radius
topRightRadius: index === 0 ? Tokens.rounding.medium : radius
bottomLeftRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius
bottomRightRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius
color: Qt.alpha(Colours.palette.m3tertiaryContainer, active ? 1 : 0)

2
components/controls/SpinBoxRow.qml
View file

@ -16,7 +16,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {

6
components/controls/SplitButton.qml
View file

@ -37,8 +37,8 @@ Row {
StyledRect {
radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
topRightRadius: Tokens.rounding.small / 2
bottomRightRadius: Tokens.rounding.small / 2
topRightRadius: Tokens.rounding.medium / 2
bottomRightRadius: Tokens.rounding.medium / 2
color: root.disabled ? root.disabledColour : root.colour
implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
@ -93,7 +93,7 @@ Row {
StyledRect {
id: expandBtn
property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.small / 2
property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.medium / 2
radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
topLeftRadius: rad

2
components/controls/SplitButtonRow.qml
View file

@ -21,7 +21,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
clip: false

2
components/controls/StyledInputField.qml
View file

@ -28,7 +28,7 @@ Item {
anchors.fill: parent
color: inputHover.containsMouse || inputField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: inputField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
opacity: root.enabled ? 1 : 0.5

2
components/controls/StyledTextField.qml
View file

@ -25,7 +25,7 @@ TextField {
implicitWidth: 2
color: Colours.palette.m3primary
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
Connections {
function onCursorPositionChanged(): void {

2
components/controls/SwitchRow.qml
View file

@ -14,7 +14,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {

2
components/controls/TextButton.qml
View file

@ -47,7 +47,7 @@ StyledRect {
onCheckedChanged: internalChecked = checked
radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: type === TextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour
implicitWidth: label.implicitWidth + horizontalPadding * 2

2
components/controls/ToggleButton.qml
View file

@ -27,7 +27,7 @@ StyledRect {
Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.normal * 2 : toggled ? Tokens.padding.small * 2 : 0)
implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2
implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2
radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.small : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)
radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)
color: toggled ? Colours.palette[`m3${accent.toLowerCase()}`] : Colours.palette[`m3${accent.toLowerCase()}Container`]
Connections {

2
components/controls/Tooltip.qml
View file

@ -120,7 +120,7 @@ Popup {
implicitHeight: tooltipText.implicitHeight + Tokens.padding.smaller * 2
color: Colours.palette.m3surfaceContainerHighest
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
antialiasing: true
// Add elevation for depth

2
components/effects/InnerBorder.qml
View file

@ -38,7 +38,7 @@ StyledRect {
anchors.fill: parent
anchors.margins: Tokens.padding.normal
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
}
}
}

2
components/filedialog/CurrentItem.qml
View file

@ -18,7 +18,7 @@ Item {
ShapePath {
id: path
readonly property real rounding: Tokens.rounding.small
readonly property real rounding: Tokens.rounding.medium
readonly property bool flatten: root.implicitHeight < rounding * 2
readonly property real roundingY: flatten ? root.implicitHeight / 2 : rounding

6
components/filedialog/DialogButtons.qml
View file

@ -31,7 +31,7 @@ StyledRect {
Layout.rightMargin: Tokens.spacing.normal
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
StyledText {
anchors.fill: parent
@ -43,7 +43,7 @@ StyledRect {
StyledRect {
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2
@ -66,7 +66,7 @@ StyledRect {
StyledRect {
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2

4
components/filedialog/FolderContents.qml
View file

@ -43,7 +43,7 @@ Item {
Rectangle {
anchors.fill: parent
anchors.margins: Tokens.padding.small
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
}
}
@ -167,7 +167,7 @@ Item {
implicitWidth: Sizes.itemWidth
implicitHeight: nonAnimHeight
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Qt.alpha(Colours.tPalette.m3surfaceContainerHighest, GridView.isCurrentItem ? Colours.tPalette.m3surfaceContainerHighest.a : 0)
z: GridView.isCurrentItem || implicitHeight !== nonAnimHeight ? 1 : 0
clip: true

6
components/filedialog/HeaderBar.qml
View file

@ -28,7 +28,7 @@ StyledRect {
implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2
StateLayer {
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
disabled: root.dialog.cwd.length === 1
onClicked: root.dialog.cwd.pop()
}
@ -46,7 +46,7 @@ StyledRect {
StyledRect {
Layout.fillWidth: true
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainerHigh
implicitHeight: pathComponents.implicitHeight + pathComponents.anchors.margins * 2
@ -95,7 +95,7 @@ StyledRect {
root.dialog.cwd = root.dialog.cwd.slice(0, folder.index + 1);
}
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
}
}

2
components/widgets/ExtraIndicator.qml
View file

@ -11,7 +11,7 @@ StyledRect {
anchors.margins: Tokens.padding.normal
color: Colours.palette.m3tertiary
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
implicitWidth: count.implicitWidth + Tokens.padding.normal * 2
implicitHeight: count.implicitHeight + Tokens.padding.small * 2

2
modules/background/DesktopClock.qml
View file

@ -63,7 +63,7 @@ Item {
visible: root.bgEnabled
anchors.fill: parent
radius: Tokens.rounding.large * root.clockScale
radius: Tokens.rounding.extraLarge * root.clockScale
opacity: Config.background.desktopClock.background.opacity
color: Colours.palette.m3surface

2
modules/background/Visualiser.qml
View file

@ -65,7 +65,7 @@ Item {
values: Audio.cava.values
primaryColor: Qt.alpha(Colours.palette.m3primary, 0.7)
secondaryColor: Qt.alpha(Colours.palette.m3inversePrimary, 0.7)
rounding: Tokens.rounding.small * Config.background.visualiser.rounding
rounding: Tokens.rounding.medium * Config.background.visualiser.rounding
spacing: Tokens.spacing.small * Config.background.visualiser.spacing
animationDuration: Tokens.anim.durations.normal

4
modules/bar/popouts/ActiveWindow.qml
View file

@ -65,7 +65,7 @@ Item {
Layout.alignment: Qt.AlignVCenter
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: root.popouts.detachRequested("winfo")
}
@ -84,7 +84,7 @@ Item {
ClippingWrapperRectangle {
color: "transparent"
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
ScreencopyView {
id: preview

2
modules/bar/popouts/Battery.qml
View file

@ -49,7 +49,7 @@ Column {
implicitHeight: child.implicitHeight + Tokens.padding.smaller * 2
color: Colours.palette.m3error
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
Column {
id: child

8
modules/bar/popouts/WirelessPassword.qml
View file

@ -129,7 +129,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredWidth: 400
implicitHeight: content.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
visible: root.shouldBeVisible || root.isClosing
opacity: root.shouldBeVisible && !root.isClosing ? 1 : 0
@ -336,7 +336,7 @@ ColumnLayout {
StyledRect {
anchors.fill: parent
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer
border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.shouldBeVisible ? 1 : 0)
border.color: {
@ -365,7 +365,7 @@ ColumnLayout {
StateLayer {
hoverEnabled: false
cursorShape: Qt.IBeamCursor
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: passwordContainer.forceActiveFocus()
}
@ -408,7 +408,7 @@ ColumnLayout {
implicitHeight: charList.implicitHeight
color: Colours.palette.m3onSurface
radius: Tokens.rounding.small / 2
radius: Tokens.rounding.medium / 2
opacity: 0
scale: 0

2
modules/controlcenter/ControlCenter.qml
View file

@ -12,7 +12,7 @@ Item {
id: root
required property ShellScreen screen
readonly property int rounding: floating ? 0 : Tokens.rounding.large
readonly property int rounding: floating ? 0 : Tokens.rounding.extraLarge
property alias floating: session.floating
property alias active: session.active

2
modules/controlcenter/NavRail.qml
View file

@ -54,7 +54,7 @@ Item {
implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Tokens.padding.normal * 2 : nonAnimWidth
color: Colours.palette.m3primaryContainer
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
StateLayer {
id: normalWinState

2
modules/controlcenter/appearance/sections/ColorSchemeSection.qml
View file

@ -32,7 +32,7 @@ CollapsibleSection {
readonly property bool isCurrent: schemeKey === Schemes.currentScheme
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: schemeRow.implicitHeight + Tokens.padding.normal * 2

2
modules/controlcenter/appearance/sections/ColorVariantSection.qml
View file

@ -29,7 +29,7 @@ CollapsibleSection {
Layout.fillWidth: true
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, modelData.variant === Schemes.currentVariant ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
border.width: modelData.variant === Schemes.currentVariant ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: variantRow.implicitHeight + Tokens.padding.normal * 2

6
modules/controlcenter/appearance/sections/FontsSection.qml
View file

@ -52,7 +52,7 @@ CollapsibleSection {
width: ListView.view.width
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilySansRow.implicitHeight + Tokens.padding.normal * 2
@ -133,7 +133,7 @@ CollapsibleSection {
width: ListView.view.width
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilyMonoRow.implicitHeight + Tokens.padding.normal * 2
@ -216,7 +216,7 @@ CollapsibleSection {
width: ListView.view.width
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilyMaterialRow.implicitHeight + Tokens.padding.normal * 2

10
modules/controlcenter/audio/AudioPane.qml
View file

@ -93,7 +93,7 @@ Item {
Layout.fillWidth: true
color: Audio.sink?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
implicitHeight: outputRowLayout.implicitHeight + Tokens.padding.normal * 2
StateLayer {
@ -170,7 +170,7 @@ Item {
Layout.fillWidth: true
color: Audio.source?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
implicitHeight: inputRowLayout.implicitHeight + Tokens.padding.normal * 2
StateLayer {
@ -314,7 +314,7 @@ Item {
implicitWidth: implicitHeight
implicitHeight: muteIcon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Audio.muted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
StateLayer {
@ -432,7 +432,7 @@ Item {
implicitWidth: implicitHeight
implicitHeight: muteInputIcon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Audio.sourceMuted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
StateLayer {
@ -566,7 +566,7 @@ Item {
implicitWidth: implicitHeight
implicitHeight: streamMuteIcon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Audio.getStreamMuted(modelData) ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
StateLayer {

14
modules/controlcenter/bluetooth/Details.qml
View file

@ -72,7 +72,7 @@ StyledFlickable {
Layout.fillWidth: true
implicitHeight: deviceStatus.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -131,7 +131,7 @@ StyledFlickable {
Layout.fillWidth: true
implicitHeight: deviceProps.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -209,7 +209,7 @@ StyledFlickable {
rightPadding: Tokens.padding.normal
background: StyledRect {
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 2
border.color: Colours.palette.m3primary
opacity: root.session.bt.editingDeviceName ? 1 : 0
@ -233,7 +233,7 @@ StyledFlickable {
implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer
opacity: root.session.bt.editingDeviceName ? 1 : 0
scale: root.session.bt.editingDeviceName ? 1 : 0.5
@ -272,7 +272,7 @@ StyledFlickable {
implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
radius: root.session.bt.editingDeviceName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
radius: root.session.bt.editingDeviceName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0)
StateLayer {
@ -337,7 +337,7 @@ StyledFlickable {
Layout.fillWidth: true
implicitHeight: deviceInfo.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -589,7 +589,7 @@ StyledFlickable {
implicitWidth: 64
implicitHeight: 64
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: root.session.bt.fabMenuOpen ? Colours.palette.m3primary : Colours.palette.m3primaryContainer
states: State {

4
modules/controlcenter/bluetooth/DeviceList.qml
View file

@ -140,7 +140,7 @@ DeviceList {
implicitHeight: deviceInner.implicitHeight + Tokens.padding.normal * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
StateLayer {
id: stateLayer
@ -163,7 +163,7 @@ DeviceList {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: device.connected ? Colours.palette.m3primaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh
StyledRect {

16
modules/controlcenter/bluetooth/Settings.qml
View file

@ -39,7 +39,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: adapterStatus.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -100,7 +100,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: adapterSettings.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -135,7 +135,7 @@ ColumnLayout {
adapterPickerButton.expanded = !adapterPickerButton.expanded;
}
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
}
RowLayout {
@ -184,7 +184,7 @@ ColumnLayout {
implicitHeight: adapterPickerButton.expanded ? adapterList.implicitHeight : adapterPickerButton.implicitHeight
color: Colours.palette.m3secondaryContainer
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
opacity: adapterPickerButton.expanded ? 1 : 0
scale: adapterPickerButton.expanded ? 1 : 0.7
@ -346,7 +346,7 @@ ColumnLayout {
rightPadding: Tokens.padding.normal
background: StyledRect {
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 2
border.color: Colours.palette.m3primary
opacity: root.session.bt.editingAdapterName ? 1 : 0
@ -370,7 +370,7 @@ ColumnLayout {
implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer
opacity: root.session.bt.editingAdapterName ? 1 : 0
scale: root.session.bt.editingAdapterName ? 1 : 0.5
@ -409,7 +409,7 @@ ColumnLayout {
implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
radius: root.session.bt.editingAdapterName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
radius: root.session.bt.editingAdapterName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0)
StateLayer {
@ -457,7 +457,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: adapterInfo.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {

4
modules/controlcenter/components/ConnectedButtonGroup.qml
View file

@ -17,7 +17,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
clip: true
@ -81,7 +81,7 @@ StyledRect {
// Match utilities Toggles radius styling
// Each button has full rounding (not connected) since they have spacing
radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal
radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : Tokens.rounding.large
// Match utilities Toggles inactive color
inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)

2
modules/controlcenter/components/WallpaperGrid.qml
View file

@ -34,7 +34,7 @@ GridView {
required property int index
readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent
readonly property real itemMargin: Tokens.spacing.normal / 2
readonly property real itemRadius: Tokens.rounding.normal
readonly property real itemRadius: Tokens.rounding.large
width: root.cellWidth
height: root.cellHeight

2
modules/controlcenter/launcher/LauncherPane.qml
View file

@ -312,7 +312,7 @@ Item {
implicitHeight: 40
color: isSelected ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
opacity: 0

4
modules/controlcenter/network/EthernetList.qml
View file

@ -65,7 +65,7 @@ DeviceList {
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, ethernetItem.isActive ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
StateLayer {
id: stateLayer
@ -87,7 +87,7 @@ DeviceList {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
StyledRect {

2
modules/controlcenter/network/EthernetSettings.qml
View file

@ -38,7 +38,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: ethernetInfo.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {

2
modules/controlcenter/network/NetworkSettings.qml
View file

@ -148,7 +148,7 @@ ColumnLayout {
background: StyledRect {
color: Colours.palette.m3surface
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
}
StyledFlickable {

10
modules/controlcenter/network/VpnDetails.qml
View file

@ -305,7 +305,7 @@ DeviceDetails {
background: StyledRect {
color: Colours.palette.m3surfaceContainerHigh
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
Elevation {
anchors.fill: parent
@ -338,7 +338,7 @@ DeviceDetails {
Layout.fillWidth: true
implicitHeight: 40
color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -375,7 +375,7 @@ DeviceDetails {
Layout.fillWidth: true
implicitHeight: 40
color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -413,7 +413,7 @@ DeviceDetails {
Layout.fillWidth: true
implicitHeight: 40
color: connectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: connectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -451,7 +451,7 @@ DeviceDetails {
Layout.fillWidth: true
implicitHeight: 40
color: disconnectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: disconnectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)

14
modules/controlcenter/network/VpnList.qml
View file

@ -106,7 +106,7 @@ ColumnLayout {
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (root.session && root.session.vpn && root.session.vpn.active === modelData) ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
StateLayer {
onClicked: {
@ -130,7 +130,7 @@ ColumnLayout {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: modelData.enabled && VPN.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
MaterialIcon {
@ -416,7 +416,7 @@ ColumnLayout {
background: StyledRect {
color: Colours.palette.m3surfaceContainerHigh
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
Elevation {
anchors.fill: parent
@ -594,7 +594,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: 40
color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -631,7 +631,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: 40
color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -669,7 +669,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: 40
color: connectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: connectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
@ -707,7 +707,7 @@ ColumnLayout {
Layout.fillWidth: true
implicitHeight: 40
color: disconnectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
border.width: 1
border.color: disconnectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)

2
modules/controlcenter/network/VpnSettings.qml
View file

@ -83,7 +83,7 @@ ColumnLayout {
width: ListView.view ? ListView.view.width : undefined
implicitHeight: 60
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
RowLayout {
anchors.left: parent.left

4
modules/controlcenter/network/WirelessList.qml
View file

@ -113,7 +113,7 @@ DeviceList {
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
StateLayer {
onClicked: {
@ -138,7 +138,7 @@ DeviceList {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: modelData.active ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
MaterialIcon {

6
modules/controlcenter/network/WirelessPasswordDialog.qml
View file

@ -101,7 +101,7 @@ Item {
implicitWidth: 400
implicitHeight: content.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surface
opacity: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0
scale: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0.7
@ -261,7 +261,7 @@ Item {
StyledRect {
anchors.fill: parent
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer
border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.visible ? 1 : 0)
border.color: {
@ -335,7 +335,7 @@ Item {
implicitHeight: charList.implicitHeight
color: Colours.palette.m3onSurface
radius: Tokens.rounding.small / 2
radius: Tokens.rounding.medium / 2
opacity: 0
scale: 0

12
modules/controlcenter/taskbar/TaskbarPane.qml
View file

@ -290,7 +290,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {
@ -326,7 +326,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {
@ -360,7 +360,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {
@ -394,7 +394,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {
@ -428,7 +428,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {
@ -464,7 +464,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {

2
modules/dashboard/Content.qml
View file

@ -83,7 +83,7 @@ Item {
anchors.bottom: parent.bottom
anchors.margins: Tokens.padding.large
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: "transparent"
Flickable {

12
modules/dashboard/Dash.qml
View file

@ -21,7 +21,7 @@ GridLayout {
Layout.preferredWidth: user.implicitWidth
Layout.preferredHeight: user.implicitHeight
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
User {
id: user
@ -37,7 +37,7 @@ GridLayout {
Layout.preferredWidth: Tokens.sizes.dashboard.weatherWidth
Layout.fillHeight: true
radius: Tokens.rounding.large * 1.5
radius: Tokens.rounding.extraLarge * 1.5
SmallWeather {}
}
@ -47,7 +47,7 @@ GridLayout {
Layout.preferredWidth: dateTime.implicitWidth
Layout.fillHeight: true
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
DateTime {
id: dateTime
@ -61,7 +61,7 @@ GridLayout {
Layout.fillWidth: true
Layout.preferredHeight: calendar.implicitHeight
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
Calendar {
id: calendar
@ -76,7 +76,7 @@ GridLayout {
Layout.preferredWidth: resources.implicitWidth
Layout.fillHeight: true
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
Resources {
id: resources
@ -90,7 +90,7 @@ GridLayout {
Layout.preferredWidth: media.implicitWidth
Layout.fillHeight: true
radius: Tokens.rounding.large * 2
radius: Tokens.rounding.extraLarge * 2
Media {
id: media

10
modules/dashboard/LyricMenu.qml
View file

@ -19,7 +19,7 @@ StyledRect {
implicitHeight: contentHeight
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
color: Colours.tPalette.m3surfaceContainer
Loader {
@ -47,7 +47,7 @@ StyledRect {
Rectangle {
Layout.preferredHeight: 24
Layout.preferredWidth: 80
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.15)
StyledText {
@ -73,7 +73,7 @@ StyledRect {
Rectangle {
Layout.preferredHeight: 24
Layout.preferredWidth: 60
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
visible: LyricsService.preferredBackend === "Auto"
color: LyricsService.backend === "Local" ? Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.15) : Qt.rgba(Colours.palette.m3secondary.r, Colours.palette.m3secondary.g, Colours.palette.m3secondary.b, 0.15)
@ -115,7 +115,7 @@ StyledRect {
Layout.fillWidth: true
Layout.preferredHeight: 48
visible: LyricsService.preferredBackend === "Local" && LyricsService.loadedLocalFile.length > 0
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.1)
ColumnLayout {
@ -195,7 +195,7 @@ StyledRect {
id: background
anchors.fill: parent
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: delegateRoot.pressed ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.25) : delegateRoot.hovered ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.06) : Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.03)

2
modules/dashboard/Media.qml
View file

@ -499,7 +499,7 @@ Item {
component PlayerControl: IconButton {
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : implicitHeight / 2
radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : implicitHeight / 2
radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial
radiusAnim.easing: Tokens.anim.expressiveFastSpatial

12
modules/dashboard/Performance.qml
View file

@ -26,7 +26,7 @@ Item {
anchors.centerIn: parent
width: 400
height: 350
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
color: Colours.tPalette.m3surfaceContainer
visible: !Config.dashboard.performance.showCpu && !(Config.dashboard.performance.showGpu && SystemUsage.gpuType !== "NONE") && !Config.dashboard.performance.showMemory && !Config.dashboard.performance.showStorage && !Config.dashboard.performance.showNetwork && !(UPower.displayDevice.isLaptopBattery && Config.dashboard.performance.showBattery)
@ -166,7 +166,7 @@ Item {
property real animatedPercentage: 0
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
Component.onCompleted: animatedPercentage = percentage
onPercentageChanged: animatedPercentage = percentage
@ -346,7 +346,7 @@ Item {
property real animatedTemp: 0
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
Component.onCompleted: {
animatedUsage = usage;
animatedTemp = tempProgress;
@ -462,7 +462,7 @@ Item {
property real animatedPercentage: 0
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
clip: true
Component.onCompleted: animatedPercentage = percentage
onPercentageChanged: animatedPercentage = percentage
@ -529,7 +529,7 @@ Item {
property color accentColor: Colours.palette.m3secondary
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
clip: true
Component.onCompleted: {
diskCount = SystemUsage.disks.length;
@ -650,7 +650,7 @@ Item {
property color accentColor: Colours.palette.m3primary
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
clip: true
Ref {

2
modules/dashboard/Tabs.qml
View file

@ -183,7 +183,7 @@ Item {
implicitHeight: parent.height + Tokens.sizes.dashboard.tabIndicatorSpacing * 2
color: "transparent"
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
StyledRect {
id: stateLayer

6
modules/dashboard/WeatherTab.qml
View file

@ -68,7 +68,7 @@ Item {
Layout.fillWidth: true
implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.large * 2
radius: Tokens.rounding.extraLarge * 2
color: Colours.tPalette.m3surfaceContainer
RowLayout {
@ -158,7 +158,7 @@ Item {
Layout.fillWidth: true
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.normal * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -213,7 +213,7 @@ Item {
Layout.fillWidth: true
Layout.preferredHeight: 60
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
Row {

4
modules/dashboard/dash/User.qml
View file

@ -20,7 +20,7 @@ Row {
implicitWidth: info.implicitHeight
implicitHeight: info.implicitHeight
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
MaterialIcon {
@ -63,7 +63,7 @@ Row {
implicitWidth: selectIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: selectIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.palette.m3primary
scale: parent.containsMouse ? 1 : 0.5
opacity: parent.containsMouse ? 1 : 0

2
modules/drawers/ContentWindow.qml
View file

@ -302,7 +302,7 @@ StyledWindow {
y: panel.y + root.borderThickness
implicitWidth: panel.width
implicitHeight: panel.height
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
deformScale: (deformAmount * Config.appearance.deformScale) / 10000
}
}

2
modules/launcher/AppList.qml
View file

@ -32,7 +32,7 @@ StyledListView {
highlightFollowsCurrentItem: false
highlight: StyledRect {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.palette.m3onSurface
opacity: 0.08

2
modules/launcher/Content.qml
View file

@ -15,7 +15,7 @@ Item {
required property real maxHeight
readonly property int padding: Tokens.padding.large
readonly property int rounding: Tokens.rounding.large
readonly property int rounding: Tokens.rounding.extraLarge
implicitWidth: listWrapper.width + padding * 2
implicitHeight: searchWrapper.height + listWrapper.height + padding * 2

4
modules/launcher/items/ActionItem.qml
View file

@ -15,7 +15,7 @@ Item {
anchors.right: parent?.right
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: root.modelData?.onClicked(root.list)
}
@ -57,7 +57,7 @@ Item {
color: Colours.palette.m3outline
elide: Text.ElideRight
width: root.width - icon.width - Tokens.rounding.normal * 2
width: root.width - icon.width - Tokens.rounding.extraLargeIncreased
anchors.top: name.bottom
}

4
modules/launcher/items/AppItem.qml
View file

@ -19,7 +19,7 @@ Item {
anchors.right: parent?.right
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: {
Apps.launch(root.modelData);
root.visibilities.launcher = false;
@ -65,7 +65,7 @@ Item {
color: Colours.palette.m3outline
elide: Text.ElideRight
width: root.width - icon.width - favouriteIcon.width - Tokens.rounding.normal * 2
width: root.width - icon.width - favouriteIcon.width - Tokens.rounding.extraLargeIncreased
anchors.top: name.bottom
}

4
modules/launcher/items/CalcItem.qml
View file

@ -28,7 +28,7 @@ Item {
anchors.right: parent?.right
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: root.onClicked()
}
@ -66,7 +66,7 @@ Item {
StyledRect {
color: Colours.palette.m3tertiary
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
clip: true
implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.normal * 2

2
modules/launcher/items/SchemeItem.qml
View file

@ -16,7 +16,7 @@ Item {
anchors.right: parent?.right
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: root.modelData?.onClicked(root.list)
}

2
modules/launcher/items/VariantItem.qml
View file

@ -16,7 +16,7 @@ Item {
anchors.right: parent?.right
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: root.modelData?.onClicked(root.list)
}

4
modules/launcher/items/WallpaperItem.qml
View file

@ -25,7 +25,7 @@ Item {
implicitHeight: image.height + label.height + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.normal
StateLayer {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
onClicked: {
Wallpapers.setWallpaper(root.modelData.path);
root.visibilities.launcher = false;
@ -49,7 +49,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
y: Tokens.padding.large
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
implicitWidth: Tokens.sizes.launcher.wallpaperWidth
implicitHeight: implicitWidth / 16 * 9

18
modules/lock/Content.qml
View file

@ -19,8 +19,8 @@ RowLayout {
Layout.fillWidth: true
implicitHeight: weather.implicitHeight
topLeftRadius: Tokens.rounding.large
radius: Tokens.rounding.small
topLeftRadius: Tokens.rounding.extraLarge
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
WeatherInfo {
@ -34,7 +34,7 @@ RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
Fetch {}
@ -44,8 +44,8 @@ RowLayout {
Layout.fillWidth: true
implicitHeight: media.implicitHeight
bottomLeftRadius: Tokens.rounding.large
radius: Tokens.rounding.small
bottomLeftRadius: Tokens.rounding.extraLarge
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
Media {
@ -68,8 +68,8 @@ RowLayout {
Layout.fillWidth: true
implicitHeight: resources.implicitHeight
topRightRadius: Tokens.rounding.large
radius: Tokens.rounding.small
topRightRadius: Tokens.rounding.extraLarge
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
Resources {
@ -81,8 +81,8 @@ RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
bottomRightRadius: Tokens.rounding.large
radius: Tokens.rounding.small
bottomRightRadius: Tokens.rounding.extraLarge
radius: Tokens.rounding.medium
color: Colours.tPalette.m3surfaceContainer
NotifDock {

4
modules/lock/Fetch.qml
View file

@ -28,7 +28,7 @@ ColumnLayout {
implicitHeight: prompt.implicitHeight + Tokens.padding.normal * 2
color: Colours.palette.m3primary
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
MonoText {
id: prompt
@ -136,7 +136,7 @@ ColumnLayout {
implicitWidth: implicitHeight
implicitHeight: Tokens.font.size.larger * 2
color: Colours.palette[`term${index}`]
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
}
}
}

2
modules/lock/InputField.qml
View file

@ -91,7 +91,7 @@ Item {
implicitHeight: charList.implicitHeight
color: Colours.palette.m3onSurface
radius: Tokens.rounding.small / 2
radius: Tokens.rounding.medium / 2
opacity: 0
scale: 0

2
modules/lock/LockSurface.qml
View file

@ -138,7 +138,7 @@ WlSessionLockSurface {
Anim {
target: lockBg
property: "radius"
to: lockContent.Tokens.rounding.large * 1.5
to: lockContent.Tokens.rounding.extraLarge * 1.5
}
Anim {
target: lockContent

2
modules/lock/Media.qml
View file

@ -155,7 +155,7 @@ Item {
implicitHeight: controlIcon.implicitHeight + Tokens.padding.normal * 2
color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`]
radius: active || controlState.pressed ? Tokens.rounding.normal : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale)
radius: active || controlState.pressed ? Tokens.rounding.large : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale)
Elevation {
anchors.fill: parent

2
modules/lock/NotifDock.qml
View file

@ -36,7 +36,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: "transparent"
Loader {

2
modules/lock/NotifGroup.qml
View file

@ -49,7 +49,7 @@ StyledRect {
implicitHeight: content.implicitHeight + Tokens.padding.normal * 2
clip: true
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: root.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
RowLayout {

2
modules/lock/Resources.qml
View file

@ -61,7 +61,7 @@ GridLayout {
implicitHeight: width
color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
CircularProgress {
id: circ

2
modules/notifications/Content.qml
View file

@ -49,7 +49,7 @@ Item {
anchors.margins: root.padding
color: "transparent"
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
StyledListView {
id: list

2
modules/notifications/Notification.qml
View file

@ -22,7 +22,7 @@ StyledRect {
property bool expanded: Config.notifs.openExpanded
color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
implicitWidth: Tokens.sizes.notifs.width
implicitHeight: inner.implicitHeight

2
modules/session/Content.qml
View file

@ -85,7 +85,7 @@ Column {
implicitWidth: Tokens.sizes.session.button
implicitHeight: Tokens.sizes.session.button
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
color: button.activeFocus ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer
Keys.onEnterPressed: Quickshell.execDetached(button.command)

2
modules/sidebar/Content.qml
View file

@ -20,7 +20,7 @@ Item {
Layout.fillWidth: true
Layout.fillHeight: true
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainerLow
NotifDock {

2
modules/sidebar/Notif.qml
View file

@ -20,7 +20,7 @@ StyledRect {
implicitHeight: nonAnimHeight
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: {
const c = root.modelData?.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2);
return expanded ? c : Qt.alpha(c, 0);

2
modules/sidebar/NotifActionList.qml
View file

@ -118,7 +118,7 @@ Item {
implicitHeight: actionInner.implicitHeight + Tokens.padding.small * 2
Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Tokens.padding.large : 0)
radius: actionStateLayer.pressed ? Tokens.rounding.small / 2 : Tokens.rounding.small
radius: actionStateLayer.pressed ? Tokens.rounding.medium / 2 : Tokens.rounding.medium
color: Colours.layer(Colours.palette.m3surfaceContainerHighest, 4)
Timer {

4
modules/sidebar/NotifDock.qml
View file

@ -82,7 +82,7 @@ Item {
anchors.bottom: parent.bottom
anchors.topMargin: Tokens.spacing.smaller
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
color: "transparent"
Loader {
@ -187,7 +187,7 @@ Item {
id: clearBtn
icon: "clear_all"
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
padding: Tokens.padding.normal
font.pointSize: Math.round(Tokens.font.size.large * 1.2)
onClicked: clearTimer.start()

2
modules/sidebar/NotifGroup.qml
View file

@ -57,7 +57,7 @@ StyledRect {
implicitHeight: nonAnimHeight
clip: true
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
Behavior on implicitHeight {

4
modules/utilities/RecordingDeleteModal.qml
View file

@ -43,7 +43,7 @@ Loader {
anchors.fill: parent
anchors.rightMargin: -parent.width * (1 - root.deformMatrix.m11) / 2 // Additional bit to account for deform
anchors.bottomMargin: -parent.height * 0.1 // Additional bit to account for overshoot
topLeftRadius: Tokens.rounding.large
topLeftRadius: Tokens.rounding.extraLarge
color: Colours.palette.m3scrim
}
@ -138,7 +138,7 @@ Loader {
StyledRect {
anchors.centerIn: parent
radius: Tokens.rounding.large
radius: Tokens.rounding.extraLarge
color: Colours.palette.m3surfaceContainerHigh
scale: 0

2
modules/utilities/cards/IdleInhibit.qml
View file

@ -11,7 +11,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
clip: true

2
modules/utilities/cards/Record.qml
View file

@ -16,7 +16,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {

4
modules/utilities/cards/Toggles.qml
View file

@ -40,7 +40,7 @@ StyledRect {
Layout.fillWidth: true
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer
ColumnLayout {
@ -155,7 +155,7 @@ StyledRect {
component Toggle: IconButton {
Layout.fillWidth: true
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal
radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : Tokens.rounding.large
inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
toggle: true
radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial

4
modules/utilities/toasts/ToastItem.qml
View file

@ -15,7 +15,7 @@ StyledRect {
anchors.right: parent.right
implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: {
if (root.modelData.type === Toast.Success)
return Colours.palette.m3successContainer;
@ -56,7 +56,7 @@ StyledRect {
spacing: Tokens.spacing.normal
StyledRect {
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
color: {
if (root.modelData.type === Toast.Success)
return Colours.palette.m3success;

4
modules/windowinfo/Buttons.qml
View file

@ -31,7 +31,7 @@ ColumnLayout {
StyledRect {
color: Colours.palette.m3primary
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.small * 2
implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.small
@ -142,7 +142,7 @@ ColumnLayout {
signal clicked
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
Layout.fillWidth: true
implicitHeight: label.implicitHeight + Tokens.padding.small * 2

2
modules/windowinfo/Preview.qml
View file

@ -30,7 +30,7 @@ Item {
implicitWidth: view.implicitWidth
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.small
radius: Tokens.rounding.medium
Loader {
asynchronous: true

4
modules/windowinfo/WindowInfo.qml
View file

@ -39,7 +39,7 @@ Item {
Layout.fillHeight: true
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
Details {
client: root.client
@ -51,7 +51,7 @@ Item {
Layout.preferredHeight: buttons.implicitHeight
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.normal
radius: Tokens.rounding.large
Buttons {
id: buttons