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

feat: use M3 padding tokens

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-20 19:23:58 +10:00
parent 711587d193
commit 57db6e246c
106 changed files with 450 additions and 429 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/controls/CircularIndicator.qml
View file

@ -20,7 +20,7 @@ BusyIndicator {
}
property real implicitSize: Tokens.font.size.normal * 3
property real strokeWidth: Tokens.padding.small * 0.8
property real strokeWidth: Tokens.padding.extraSmall * 0.8
property color fgColour: Colours.palette.m3primary
property color bgColour: Colours.palette.m3secondaryContainer

2
components/controls/CircularProgress.qml
View file

@ -9,7 +9,7 @@ Shape {
property real value
property int startAngle: -90
property int strokeWidth: Tokens.padding.smaller
property int strokeWidth: Tokens.padding.small
property int padding: 0
property int spacing: Tokens.spacing.small
property color fgColour: Colours.palette.m3primary

10
components/controls/CollapsibleSection.qml
View file

@ -24,7 +24,7 @@ ColumnLayout {
id: sectionHeaderItem
Layout.fillWidth: true
Layout.preferredHeight: Math.max(titleRow.implicitHeight + Tokens.padding.normal * 2, 48)
Layout.preferredHeight: Math.max(titleRow.implicitHeight + Tokens.padding.medium * 2, 48)
RowLayout {
id: titleRow
@ -32,8 +32,8 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.normal
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledText {
@ -103,8 +103,8 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
y: Tokens.spacing.small
anchors.leftMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.normal
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
anchors.bottomMargin: Tokens.spacing.small
spacing: Tokens.spacing.small
opacity: root.expanded ? 1.0 : 0.0

10
components/controls/CustomSpinBox.qml
View file

@ -73,9 +73,9 @@ RowLayout {
root.isEditing = false;
}
padding: Tokens.padding.small
leftPadding: Tokens.padding.normal
rightPadding: Tokens.padding.normal
padding: Tokens.padding.extraSmall
leftPadding: Tokens.padding.medium
rightPadding: Tokens.padding.medium
background: StyledRect {
implicitWidth: 100
@ -89,7 +89,7 @@ RowLayout {
color: Colours.palette.m3primary
implicitWidth: implicitHeight
implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
id: upState
@ -124,7 +124,7 @@ RowLayout {
color: Colours.palette.m3primary
implicitWidth: implicitHeight
implicitHeight: downIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: downIcon.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
id: downState

2
components/controls/IconButton.qml
View file

@ -15,7 +15,7 @@ StyledRect {
property alias icon: label.text
property bool checked
property bool toggle
property real padding: type === IconButton.Text ? Tokens.padding.small / 2 : Tokens.padding.smaller
property real padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.small
property alias font: label.font
property int type: IconButton.Filled
property bool disabled

4
components/controls/IconTextButton.qml
View file

@ -17,8 +17,8 @@ StyledRect {
property alias text: label.text
property bool checked
property bool toggle
property real horizontalPadding: Tokens.padding.normal
property real verticalPadding: Tokens.padding.smaller
property real horizontalPadding: Tokens.padding.medium
property real verticalPadding: Tokens.padding.small
property alias font: label.font
property int type: IconTextButton.Filled

8
components/controls/Menu.qml
View file

@ -105,7 +105,7 @@ MouseArea {
id: column
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
spacing: 0
Repeater {
@ -121,8 +121,8 @@ MouseArea {
readonly property bool active: modelData === root.active
Layout.fillWidth: true
implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.normal * 2
implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.normal * 2
implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.medium * 2
implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.medium * 2
radius: active ? Tokens.rounding.medium : Tokens.rounding.extraSmall
topLeftRadius: index === 0 ? Tokens.rounding.medium : radius
@ -156,7 +156,7 @@ MouseArea {
id: menuOptionRow
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.small
MaterialIcon {

4
components/controls/SplitButton.qml
View file

@ -12,8 +12,8 @@ Row {
Tonal
}
property real horizontalPadding: Tokens.padding.normal
property real verticalPadding: Tokens.padding.smaller
property real horizontalPadding: Tokens.padding.medium
property real verticalPadding: Tokens.padding.small
property int type: SplitButton.Filled
property bool disabled
property bool menuOnTop

4
components/controls/StyledInputField.qml
View file

@ -21,7 +21,7 @@ Item {
signal editingFinished
implicitWidth: 70
implicitHeight: inputField.implicitHeight + Tokens.padding.small * 2
implicitHeight: inputField.implicitHeight + Tokens.padding.extraSmall * 2
StyledRect {
id: container
@ -54,7 +54,7 @@ Item {
id: inputField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: root.horizontalAlignment
validator: root.validator
readOnly: root.readOnly

2
components/controls/StyledRadioButton.qml
View file

@ -24,7 +24,7 @@ RadioButton {
anchors.verticalCenter: parent.verticalCenter
StateLayer {
anchors.margins: -Tokens.padding.smaller
anchors.margins: -Tokens.padding.small
color: root.checked ? Colours.palette.m3onSurface : Colours.palette.m3primary
z: -1
onClicked: root.click()

2
components/controls/StyledScrollBar.qml
View file

@ -45,7 +45,7 @@ ScrollBar {
}
}
}
implicitWidth: Tokens.padding.small
implicitWidth: Tokens.padding.extraSmall
contentItem: StyledRect {
anchors.left: parent.left

8
components/controls/StyledSwitch.qml
View file

@ -18,7 +18,7 @@ Switch {
color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer)
implicitWidth: implicitHeight * 1.7
implicitHeight: Tokens.font.size.normal + Tokens.padding.smaller * 2
implicitHeight: Tokens.font.size.normal + Tokens.padding.small * 2
StyledRect {
readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
@ -26,9 +26,9 @@ Switch {
radius: Tokens.rounding.full
color: root.checked ? Colours.palette.m3onPrimary : Colours.layer(Colours.palette.m3outline, root.cLayer + 1)
x: root.checked ? parent.implicitWidth - nonAnimWidth - Tokens.padding.small / 2 : Tokens.padding.small / 2
x: root.checked ? parent.implicitWidth - nonAnimWidth - Tokens.padding.extraSmall / 2 : Tokens.padding.extraSmall / 2
implicitWidth: nonAnimWidth
implicitHeight: parent.implicitHeight - Tokens.padding.small
implicitHeight: parent.implicitHeight - Tokens.padding.extraSmall
anchors.verticalCenter: parent.verticalCenter
StyledRect {
@ -83,7 +83,7 @@ Switch {
anchors.centerIn: parent
width: height
height: parent.implicitHeight - Tokens.padding.small * 2
height: parent.implicitHeight - Tokens.padding.extraSmall * 2
preferredRendererType: Shape.CurveRenderer
asynchronous: true

4
components/controls/TextButton.qml
View file

@ -15,8 +15,8 @@ StyledRect {
property alias text: label.text
property bool checked
property bool toggle
property real horizontalPadding: Tokens.padding.normal
property real verticalPadding: Tokens.padding.smaller
property real horizontalPadding: Tokens.padding.medium
property real verticalPadding: Tokens.padding.small
property alias font: label.font
property int type: TextButton.Filled

4
components/controls/ToggleButton.qml
View file

@ -16,7 +16,7 @@ StyledRect {
property string accent: "Secondary"
property real iconSize: Tokens.font.size.large
property real horizontalPadding: Tokens.padding.large
property real verticalPadding: Tokens.padding.normal
property real verticalPadding: Tokens.padding.medium
property string tooltip: ""
property bool hovered: false
@ -24,7 +24,7 @@ StyledRect {
Component.onCompleted: hovered = toggleStateLayer.containsMouse
Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.normal * 2 : toggled ? Tokens.padding.small * 2 : 0)
Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.medium * 2 : toggled ? Tokens.padding.extraSmall * 2 : 0)
implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2
implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2
radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)

6
components/controls/Tooltip.qml
View file

@ -47,7 +47,7 @@ Popup {
let newY = targetPos.y - tooltipHeight - Tokens.spacing.small;
// Keep within bounds
const padding = Tokens.padding.normal;
const padding = Tokens.padding.medium;
if (newX < padding) {
newX = padding;
} else if (newX + tooltipWidth > (parent.width - padding)) {
@ -116,8 +116,8 @@ Popup {
contentItem: StyledRect {
id: tooltipRect
implicitWidth: tooltipText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: tooltipText.implicitHeight + Tokens.padding.smaller * 2
implicitWidth: tooltipText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: tooltipText.implicitHeight + Tokens.padding.small * 2
color: Colours.palette.m3surfaceContainerHighest
radius: Tokens.rounding.medium

2
components/effects/InnerBorder.qml
View file

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

8
components/filedialog/CurrentItem.qml
View file

@ -9,8 +9,8 @@ Item {
required property var currentItem
implicitWidth: content.implicitWidth + Tokens.padding.larger + content.anchors.rightMargin
implicitHeight: currentItem ? content.implicitHeight + Tokens.padding.normal + content.anchors.bottomMargin : 0
implicitWidth: content.implicitWidth + Tokens.padding.medium + content.anchors.rightMargin
implicitHeight: currentItem ? content.implicitHeight + Tokens.padding.medium + content.anchors.bottomMargin : 0
Shape {
preferredRendererType: Shape.CurveRenderer
@ -76,8 +76,8 @@ Item {
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.rightMargin: Tokens.padding.larger - Tokens.padding.small
anchors.bottomMargin: Tokens.padding.normal - Tokens.padding.small
anchors.rightMargin: Tokens.padding.medium - Tokens.padding.extraSmall
anchors.bottomMargin: Tokens.padding.medium - Tokens.padding.extraSmall
Connections {
function onCurrentItemChanged(): void {

18
components/filedialog/DialogButtons.qml
View file

@ -9,7 +9,7 @@ StyledRect {
required property var dialog
required property FolderContents folder
implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2
implicitHeight: inner.implicitHeight + Tokens.padding.medium * 2
color: Colours.tPalette.m3surfaceContainer
@ -17,7 +17,7 @@ StyledRect {
id: inner
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.small
@ -35,7 +35,7 @@ StyledRect {
StyledText {
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
text: `${root.dialog.filterLabel} (${root.dialog.filters.map(f => `*.${f}`).join(", ")})`
}
@ -45,8 +45,8 @@ StyledRect {
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.medium
implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2
implicitWidth: cancelText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.medium * 2
StateLayer {
disabled: !root.dialog.selectionValid
@ -57,7 +57,7 @@ StyledRect {
id: selectText
anchors.centerIn: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
text: qsTr("Select")
color: root.dialog.selectionValid ? Colours.palette.m3onSurface : Colours.palette.m3outline
@ -68,8 +68,8 @@ StyledRect {
color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.medium
implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2
implicitWidth: cancelText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: cancelText.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -81,7 +81,7 @@ StyledRect {
id: cancelText
anchors.centerIn: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
text: qsTr("Cancel")
}

16
components/filedialog/FolderContents.qml
View file

@ -42,7 +42,7 @@ Item {
Rectangle {
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
radius: Tokens.rounding.medium
}
}
@ -80,10 +80,10 @@ Item {
id: view
anchors.fill: parent
anchors.margins: Tokens.padding.small + Tokens.padding.normal
anchors.margins: Tokens.padding.extraSmall + Tokens.padding.medium
cellWidth: Sizes.itemWidth + Tokens.spacing.small
cellHeight: Sizes.itemWidth + Tokens.spacing.small * 2 + Tokens.padding.normal * 2 + 1
cellHeight: Sizes.itemWidth + Tokens.spacing.small * 2 + Tokens.padding.medium * 2 + 1
clip: true
focus: true
@ -151,7 +151,7 @@ Item {
CurrentItem {
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
currentItem: view.currentItem
}
@ -162,7 +162,7 @@ Item {
required property int index
required property FileSystemEntry modelData
readonly property real nonAnimHeight: icon.implicitHeight + name.anchors.topMargin + name.implicitHeight + Tokens.padding.normal * 2
readonly property real nonAnimHeight: icon.implicitHeight + name.anchors.topMargin + name.implicitHeight + Tokens.padding.medium * 2
implicitWidth: Sizes.itemWidth
implicitHeight: nonAnimHeight
@ -187,9 +187,9 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: Tokens.padding.normal
anchors.topMargin: Tokens.padding.medium
implicitSize: Sizes.itemWidth - Tokens.padding.normal * 2
implicitSize: Sizes.itemWidth - Tokens.padding.medium * 2
Component.onCompleted: {
const file = item.modelData;
@ -211,7 +211,7 @@ Item {
anchors.right: parent.right
anchors.top: icon.bottom
anchors.topMargin: Tokens.spacing.small
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
horizontalAlignment: Text.AlignHCenter
elide: item.GridView.isCurrentItem ? Text.ElideNone : Text.ElideRight

18
components/filedialog/HeaderBar.qml
View file

@ -11,8 +11,8 @@ StyledRect {
required property var dialog
implicitWidth: inner.implicitWidth + Tokens.padding.normal * 2
implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2
implicitWidth: inner.implicitWidth + Tokens.padding.medium * 2
implicitHeight: inner.implicitHeight + Tokens.padding.medium * 2
color: Colours.tPalette.m3surfaceContainer
@ -20,12 +20,12 @@ StyledRect {
id: inner
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.small
Item {
implicitWidth: implicitHeight
implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
radius: Tokens.rounding.medium
@ -55,7 +55,7 @@ StyledRect {
id: pathComponents
anchors.fill: parent
anchors.margins: Tokens.padding.small / 2
anchors.margins: Tokens.padding.extraSmall / 2
anchors.leftMargin: 0
spacing: Tokens.spacing.small
@ -83,8 +83,8 @@ StyledRect {
}
Item {
implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.small : 0) + folderName.implicitWidth + Tokens.padding.normal * 2
implicitHeight: folderName.implicitHeight + Tokens.padding.small * 2
implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.extraSmall : 0) + folderName.implicitWidth + Tokens.padding.medium * 2
implicitHeight: folderName.implicitHeight + Tokens.padding.extraSmall * 2
Loader {
asynchronous: true
@ -106,7 +106,7 @@ StyledRect {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Tokens.padding.normal
anchors.leftMargin: Tokens.padding.medium
active: folder.index === 0 && folder.modelData === "Home"
sourceComponent: MaterialIcon {
@ -121,7 +121,7 @@ StyledRect {
anchors.left: homeIcon.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: homeIcon.active ? Tokens.padding.small : 0
anchors.leftMargin: homeIcon.active ? Tokens.padding.extraSmall : 0
text: folder.modelData
color: folder.index < root.dialog.cwd.length - 1 ? Colours.palette.m3onSurfaceVariant : Colours.palette.m3onSurface

10
components/filedialog/Sidebar.qml
View file

@ -13,7 +13,7 @@ StyledRect {
required property var dialog
implicitWidth: Sizes.sidebarWidth
implicitHeight: inner.implicitHeight + Tokens.padding.normal * 2
implicitHeight: inner.implicitHeight + Tokens.padding.medium * 2
color: Colours.tPalette.m3surfaceContainer
@ -23,12 +23,12 @@ StyledRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.small / 2
StyledText {
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Tokens.padding.small / 2
Layout.topMargin: Tokens.padding.extraSmall / 2
Layout.bottomMargin: Tokens.spacing.normal
text: qsTr("Files")
color: Colours.palette.m3onSurface
@ -46,7 +46,7 @@ StyledRect {
readonly property bool selected: modelData === root.dialog.cwd[root.dialog.cwd.length - 1]
Layout.fillWidth: true
implicitHeight: placeInner.implicitHeight + Tokens.padding.normal * 2
implicitHeight: placeInner.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3secondaryContainer, selected ? 1 : 0)
@ -65,7 +65,7 @@ StyledRect {
id: placeInner
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: Tokens.padding.large
anchors.rightMargin: Tokens.padding.large

6
components/widgets/ExtraIndicator.qml
View file

@ -8,13 +8,13 @@ StyledRect {
required property int extra
anchors.right: parent.right
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
color: Colours.palette.m3tertiary
radius: Tokens.rounding.medium
implicitWidth: count.implicitWidth + Tokens.padding.normal * 2
implicitHeight: count.implicitHeight + Tokens.padding.small * 2
implicitWidth: count.implicitWidth + Tokens.padding.medium * 2
implicitHeight: count.implicitHeight + Tokens.padding.extraSmall * 2
opacity: extra > 0 ? 1 : 0
scale: extra > 0 ? 1 : 0.5

2
modules/background/Background.qml
View file

@ -58,7 +58,7 @@ Variants {
active: Config.background.desktopClock.enabled
anchors.margins: Tokens.padding.large * 2
anchors.leftMargin: Tokens.padding.large * 2 + Tokens.sizes.bar.innerWidth + Math.max(Tokens.padding.smaller, Config.border.thickness)
anchors.leftMargin: Tokens.padding.large * 2 + Tokens.sizes.bar.innerWidth + Math.max(Tokens.padding.small, Config.border.thickness)
state: Config.background.desktopClock.position
states: [

2
modules/background/Wallpaper.qml
View file

@ -64,7 +64,7 @@ Item {
StyledRect {
implicitWidth: selectWallText.implicitWidth + Tokens.padding.large * 2
implicitHeight: selectWallText.implicitHeight + Tokens.padding.small * 2
implicitHeight: selectWallText.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.full
color: Colours.palette.m3primary

2
modules/bar/BarWrapper.qml
View file

@ -18,7 +18,7 @@ Item {
readonly property bool disabled: Strings.testRegexList(Config.bar.excludedScreens, screen.name)
readonly property int clampedWidth: Math.max(Config.border.minThickness, implicitWidth)
readonly property int padding: Math.max(Tokens.padding.smaller, Config.border.thickness)
readonly property int padding: Math.max(Tokens.padding.small, Config.border.thickness)
readonly property int contentWidth: Tokens.sizes.bar.innerWidth + padding * 2
readonly property int exclusiveZone: !disabled && (Config.bar.persistent || visibilities.bar) ? contentWidth : Config.border.thickness
readonly property bool shouldBeVisible: !fullscreen && !disabled && (Config.bar.persistent || visibilities.bar || isHovered)

2
modules/bar/components/Clock.qml
View file

@ -9,7 +9,7 @@ StyledRect {
id: root
readonly property color colour: Colours.palette.m3tertiary
readonly property int padding: Config.bar.clock.background ? Tokens.padding.normal : Tokens.padding.small
readonly property int padding: Config.bar.clock.background ? Tokens.padding.medium : Tokens.padding.extraSmall
implicitWidth: Tokens.sizes.bar.innerWidth
implicitHeight: layout.implicitHeight + root.padding * 2

4
modules/bar/components/Power.qml
View file

@ -8,7 +8,7 @@ Item {
required property DrawerVisibilities visibilities
implicitWidth: icon.implicitHeight + Tokens.padding.small * 2
implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall * 2
implicitHeight: icon.implicitHeight
StateLayer {
@ -16,7 +16,7 @@ Item {
anchors.fill: undefined
anchors.centerIn: parent
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.full
onClicked: root.visibilities.session = !root.visibilities.session
}

4
modules/bar/components/StatusIcons.qml
View file

@ -21,7 +21,7 @@ StyledRect {
clip: true
implicitWidth: Tokens.sizes.bar.innerWidth
implicitHeight: iconColumn.implicitHeight + Tokens.padding.normal * 2 - (Config.bar.status.showLockStatus && !Hypr.capsLock && !Hypr.numLock ? iconColumn.spacing : 0)
implicitHeight: iconColumn.implicitHeight + Tokens.padding.medium * 2 - (Config.bar.status.showLockStatus && !Hypr.capsLock && !Hypr.numLock ? iconColumn.spacing : 0)
ColumnLayout {
id: iconColumn
@ -29,7 +29,7 @@ StyledRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.bottomMargin: Tokens.padding.normal
anchors.bottomMargin: Tokens.padding.medium
spacing: Tokens.spacing.smaller / 2

6
modules/bar/components/Tray.qml
View file

@ -14,7 +14,7 @@ StyledRect {
readonly property alias items: items
readonly property alias expandIcon: expandIcon
readonly property int padding: Config.bar.tray.background ? Tokens.padding.normal : Tokens.padding.small
readonly property int padding: Config.bar.tray.background ? Tokens.padding.medium : Tokens.padding.extraSmall
readonly property int spacing: Config.bar.tray.background ? Tokens.spacing.small : 0
property bool expanded
@ -91,14 +91,14 @@ StyledRect {
sourceComponent: Item {
implicitWidth: expandIconInner.implicitWidth
implicitHeight: expandIconInner.implicitHeight - Tokens.padding.small * 2
implicitHeight: expandIconInner.implicitHeight - Tokens.padding.extraSmall * 2
MaterialIcon {
id: expandIconInner
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: Config.bar.tray.background ? Tokens.padding.small : -Tokens.padding.small
anchors.bottomMargin: Config.bar.tray.background ? Tokens.padding.extraSmall : -Tokens.padding.extraSmall
text: "expand_less"
font.pointSize: Tokens.font.size.large
rotation: root.expanded ? 180 : 0

2
modules/bar/components/workspaces/ActiveIndicator.qml
View file

@ -44,7 +44,7 @@ StyledRect {
clip: true
y: offset + mask.y
implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2
implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
implicitHeight: size
radius: Tokens.rounding.full
color: Colours.palette.m3primary

2
modules/bar/components/workspaces/OccupiedBg.qml
View file

@ -65,7 +65,7 @@ Item {
anchors.horizontalCenter: root.horizontalCenter
y: (start?.y ?? 0) - 1
implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2 + 2
implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2 + 2
implicitHeight: start && end ? end.y + end.size - start.y + 2 : 0
color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)

8
modules/bar/components/workspaces/SpecialWorkspaces.qml
View file

@ -76,7 +76,7 @@ Item {
radius: Tokens.rounding.full
implicitHeight: parent.height / 2
opacity: view.contentY < view.contentHeight - parent.height + Tokens.padding.small ? 0 : 1
opacity: view.contentY < view.contentHeight - parent.height + Tokens.padding.extraSmall ? 0 : 1
Behavior on opacity {
Anim {}
@ -213,7 +213,7 @@ Item {
drag.target: view.contentItem
drag.axis: Drag.YAxis
drag.maximumY: 0
drag.minimumY: Math.min(0, view.height - view.contentHeight - Tokens.padding.small)
drag.minimumY: Math.min(0, view.height - view.contentHeight - Tokens.padding.extraSmall)
onPressed: event => startY = event.y
@ -233,7 +233,7 @@ Item {
id: ws
required property HyprlandWorkspace modelData
readonly property int size: label.Layout.preferredHeight + (hasWindows ? windows.implicitHeight + Tokens.padding.small : 0)
readonly property int size: label.Layout.preferredHeight + (hasWindows ? windows.implicitHeight + Tokens.padding.extraSmall : 0)
property int wsId
property string icon
property bool hasWindows
@ -284,7 +284,7 @@ Item {
asynchronous: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
sourceComponent: ws.icon.length === 1 ? letterComp : iconComp

4
modules/bar/components/workspaces/Workspace.qml
View file

@ -18,7 +18,7 @@ ColumnLayout {
readonly property bool isWorkspace: true // Flag for finding workspace children
// Unanimated prop for others to use as reference
readonly property int size: implicitHeight + (hasWindows ? Tokens.padding.small : 0)
readonly property int size: implicitHeight + (hasWindows ? Tokens.padding.extraSmall : 0)
readonly property int ws: groupOffset + index + 1
readonly property bool isOccupied: occupied[ws] ?? false
@ -33,7 +33,7 @@ ColumnLayout {
id: indicator
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
animate: true
text: {

6
modules/bar/components/workspaces/Workspaces.qml
View file

@ -28,7 +28,7 @@ StyledClippingRect {
property real blur: onSpecial ? 1 : 0
implicitWidth: Tokens.sizes.bar.innerWidth
implicitHeight: layout.implicitHeight + Tokens.padding.small * 2
implicitHeight: layout.implicitHeight + Tokens.padding.extraSmall * 2
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full
@ -51,7 +51,7 @@ StyledClippingRect {
active: Config.bar.workspaces.occupiedBg
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
sourceComponent: OccupiedBg {
workspaces: workspaces
@ -118,7 +118,7 @@ StyledClippingRect {
asynchronous: true
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
active: opacity > 0

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

@ -59,8 +59,8 @@ Item {
}
Item {
implicitWidth: expandIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: expandIcon.implicitHeight + Tokens.padding.small * 2
implicitWidth: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2
implicitHeight: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2
Layout.alignment: Qt.AlignVCenter

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

@ -14,8 +14,8 @@ Item {
required property PopoutState popouts
implicitWidth: layout.implicitWidth + Tokens.padding.normal * 2
implicitHeight: layout.implicitHeight + Tokens.padding.normal * 2
implicitWidth: layout.implicitWidth + Tokens.padding.medium * 2
implicitHeight: layout.implicitHeight + Tokens.padding.medium * 2
ButtonGroup {
id: sinks
@ -80,7 +80,7 @@ Item {
CustomMouseArea {
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
onWheel: event => {
if (event.angleDelta.y > 0)
@ -108,7 +108,7 @@ Item {
Layout.topMargin: Tokens.spacing.normal
inactiveColour: Colours.palette.m3primaryContainer
inactiveOnColour: Colours.palette.m3onPrimaryContainer
verticalPadding: Tokens.padding.small
verticalPadding: Tokens.padding.extraSmall
text: qsTr("Open settings")
icon: "settings"

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

@ -45,8 +45,8 @@ Column {
height: active ? ((item as Item)?.implicitHeight ?? 0) : 0
sourceComponent: StyledRect {
implicitWidth: child.implicitWidth + Tokens.padding.normal * 2
implicitHeight: child.implicitHeight + Tokens.padding.smaller * 2
implicitWidth: child.implicitWidth + Tokens.padding.medium * 2
implicitHeight: child.implicitHeight + Tokens.padding.small * 2
color: Colours.palette.m3error
radius: Tokens.rounding.large
@ -109,8 +109,8 @@ Column {
anchors.horizontalCenter: parent.horizontalCenter
implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.normal * 2 + Tokens.spacing.large * 2
implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.small * 2
implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.medium * 2 + Tokens.spacing.large * 2
implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.extraSmall * 2
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full
@ -158,7 +158,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Tokens.padding.small
anchors.leftMargin: Tokens.padding.extraSmall
profile: PowerProfile.PowerSaver
icon: "energy_savings_leaf"
@ -178,7 +178,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Tokens.padding.small
anchors.rightMargin: Tokens.padding.extraSmall
profile: PowerProfile.Performance
icon: "rocket_launch"
@ -199,8 +199,8 @@ Column {
required property string icon
required property int profile
implicitWidth: icon.implicitHeight + Tokens.padding.small * 2
implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall * 2
implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
radius: Tokens.rounding.full

14
modules/bar/popouts/Bluetooth.qml
View file

@ -19,8 +19,8 @@ ColumnLayout {
spacing: Tokens.spacing.small
StyledText {
Layout.topMargin: Tokens.padding.normal
Layout.rightMargin: Tokens.padding.small
Layout.topMargin: Tokens.padding.medium
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Bluetooth")
font.weight: 500
}
@ -47,7 +47,7 @@ ColumnLayout {
StyledText {
Layout.topMargin: Tokens.spacing.small
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
text: {
const devices = Bluetooth.devices.values; // qmllint disable unresolved-type
let available = qsTr("%1 device%2 available").arg(devices.length).arg(devices.length === 1 ? "" : "s");
@ -72,7 +72,7 @@ ColumnLayout {
readonly property bool loading: modelData.state === BluetoothDeviceState.Connecting || modelData.state === BluetoothDeviceState.Disconnecting // qmllint disable unresolved-type
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
spacing: Tokens.spacing.small
opacity: 0
@ -113,7 +113,7 @@ ColumnLayout {
id: connectBtn
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small
implicitHeight: connectIcon.implicitHeight + Tokens.padding.extraSmall
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primary, device.modelData.state === BluetoothDeviceState.Connected ? 1 : 0) // qmllint disable unresolved-type
@ -172,7 +172,7 @@ ColumnLayout {
Layout.topMargin: Tokens.spacing.normal
inactiveColour: Colours.palette.m3primaryContainer
inactiveOnColour: Colours.palette.m3onPrimaryContainer
verticalPadding: Tokens.padding.small
verticalPadding: Tokens.padding.extraSmall
text: qsTr("Open settings")
icon: "settings"
@ -185,7 +185,7 @@ ColumnLayout {
property alias toggle: toggle
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
spacing: Tokens.spacing.normal
StyledText {

28
modules/bar/popouts/Network.qml
View file

@ -26,8 +26,8 @@ ColumnLayout {
StyledText {
visible: root.view === "wireless"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.padding.normal : 0
Layout.rightMargin: Tokens.padding.small
Layout.topMargin: visible ? Tokens.padding.medium : 0
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Wireless")
font.weight: 500
}
@ -44,7 +44,7 @@ ColumnLayout {
visible: root.view === "wireless"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.spacing.small : 0
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("%1 networks available").arg(Nmcli.networks.length) // qmllint disable missing-property
color: Colours.palette.m3onSurfaceVariant
font.pointSize: Tokens.font.size.small
@ -70,7 +70,7 @@ ColumnLayout {
visible: root.view === "wireless"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
spacing: Tokens.spacing.small
opacity: 0
@ -112,7 +112,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: wirelessConnectIcon.implicitHeight + Tokens.padding.small
implicitHeight: wirelessConnectIcon.implicitHeight + Tokens.padding.extraSmall
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primary, networkItem.modelData.active ? 1 : 0)
@ -167,7 +167,7 @@ ColumnLayout {
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.spacing.small : 0
Layout.fillWidth: true
implicitHeight: rescanBtn.implicitHeight + Tokens.padding.small * 2
implicitHeight: rescanBtn.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.full
color: Colours.palette.m3primaryContainer
@ -207,9 +207,9 @@ ColumnLayout {
CircularIndicator {
anchors.centerIn: parent
strokeWidth: Tokens.padding.small / 2
strokeWidth: Tokens.padding.extraSmall / 2
bgColour: "transparent"
implicitSize: parent.implicitHeight - Tokens.padding.smaller * 2
implicitSize: parent.implicitHeight - Tokens.padding.small * 2
running: Nmcli.scanning
}
}
@ -218,8 +218,8 @@ ColumnLayout {
StyledText {
visible: root.view === "ethernet"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.padding.normal : 0
Layout.rightMargin: Tokens.padding.small
Layout.topMargin: visible ? Tokens.padding.medium : 0
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Ethernet")
font.weight: 500
}
@ -228,7 +228,7 @@ ColumnLayout {
visible: root.view === "ethernet"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.spacing.small : 0
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("%1 devices available").arg(Nmcli.ethernetDevices.length)
color: Colours.palette.m3onSurfaceVariant
font.pointSize: Tokens.font.size.small
@ -253,7 +253,7 @@ ColumnLayout {
visible: root.view === "ethernet"
Layout.preferredHeight: visible ? implicitHeight : 0
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
spacing: Tokens.spacing.small
opacity: 0
@ -289,7 +289,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small
implicitHeight: connectIcon.implicitHeight + Tokens.padding.extraSmall
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primary, ethernetItem.modelData.connected ? 1 : 0)
@ -371,7 +371,7 @@ ColumnLayout {
property alias toggle: toggle
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
spacing: Tokens.spacing.normal
StyledText {

14
modules/bar/popouts/TrayMenu.qml
View file

@ -45,7 +45,7 @@ StackView {
property bool isSubMenu
property bool shown
padding: Tokens.padding.smaller
padding: Tokens.padding.small
spacing: Tokens.spacing.small
opacity: shown ? 1 : 0
@ -97,9 +97,9 @@ StackView {
implicitHeight: label.implicitHeight
StateLayer {
anchors.margins: -Tokens.padding.small / 2
anchors.leftMargin: -Tokens.padding.smaller
anchors.rightMargin: -Tokens.padding.smaller
anchors.margins: -Tokens.padding.extraSmall / 2
anchors.leftMargin: -Tokens.padding.small
anchors.rightMargin: -Tokens.padding.small
radius: item.radius
disabled: !item.modelData.enabled
@ -189,9 +189,9 @@ StackView {
StyledRect {
anchors.fill: parent
anchors.margins: -Tokens.padding.small / 2
anchors.leftMargin: -Tokens.padding.smaller
anchors.rightMargin: -Tokens.padding.smaller * 2
anchors.margins: -Tokens.padding.extraSmall / 2
anchors.leftMargin: -Tokens.padding.small
anchors.rightMargin: -Tokens.padding.small * 2
radius: Tokens.rounding.full
color: Colours.palette.m3secondaryContainer

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

@ -263,7 +263,7 @@ ColumnLayout {
objectName: "passwordContainer"
Layout.topMargin: Tokens.spacing.large
Layout.fillWidth: true
implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.normal * 2)
implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.medium * 2)
focus: true
activeFocusOnTab: true
@ -471,7 +471,7 @@ ColumnLayout {
id: cancelButton
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
@ -486,7 +486,7 @@ ColumnLayout {
property bool hasError: false
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3primary
inactiveOnColour: Colours.palette.m3onPrimary
text: qsTr("Connect")

16
modules/bar/popouts/kblayout/KbLayout.qml
View file

@ -24,8 +24,8 @@ ColumnLayout {
}
StyledText {
Layout.topMargin: Tokens.padding.normal
Layout.rightMargin: Tokens.padding.small
Layout.topMargin: Tokens.padding.medium
Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Keyboard Layouts")
font.weight: 500
}
@ -36,7 +36,7 @@ ColumnLayout {
model: kb.visibleModel
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
Layout.topMargin: Tokens.spacing.small
clip: true
@ -88,7 +88,7 @@ ColumnLayout {
readonly property bool isDisabled: layoutIndex > 3
width: list.width
height: Math.max(36, rowText.implicitHeight + Tokens.padding.small * 2)
height: Math.max(36, rowText.implicitHeight + Tokens.padding.extraSmall * 2)
ToolTip.visible: isDisabled && layer.containsMouse
ToolTip.text: "XKB limitation: maximum 4 layouts allowed"
@ -114,8 +114,8 @@ ColumnLayout {
anchors.verticalCenter: layer.verticalCenter
anchors.left: layer.left
anchors.right: layer.right
anchors.leftMargin: Tokens.padding.small
anchors.rightMargin: Tokens.padding.small
anchors.leftMargin: Tokens.padding.extraSmall
anchors.rightMargin: Tokens.padding.extraSmall
text: kbDelegate.label
elide: Text.ElideRight
opacity: kbDelegate.isDisabled ? 0.4 : 1.0
@ -126,7 +126,7 @@ ColumnLayout {
Rectangle {
visible: kb.activeLabel.length > 0
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
Layout.topMargin: Tokens.spacing.small
implicitHeight: 1
@ -139,7 +139,7 @@ ColumnLayout {
visible: kb.activeLabel.length > 0
Layout.fillWidth: true
Layout.rightMargin: Tokens.padding.small
Layout.rightMargin: Tokens.padding.extraSmall
Layout.topMargin: Tokens.spacing.small
spacing: Tokens.spacing.small

10
modules/controlcenter/NavRail.qml
View file

@ -15,7 +15,7 @@ Item {
required property Session session
required property bool initialOpeningComplete
implicitWidth: layout.implicitWidth + Tokens.padding.larger * 4
implicitWidth: layout.implicitWidth + Tokens.padding.medium * 4
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
ColumnLayout {
@ -23,7 +23,7 @@ Item {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Tokens.padding.larger * 2
anchors.leftMargin: Tokens.padding.medium * 2
spacing: Tokens.spacing.normal
states: State {
@ -51,7 +51,7 @@ Item {
readonly property int nonAnimWidth: normalWinIcon.implicitWidth + (root.session.navExpanded ? normalWinLabel.anchors.leftMargin + normalWinLabel.implicitWidth : 0) + normalWinIcon.anchors.leftMargin * 2
implicitWidth: nonAnimWidth
implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Tokens.padding.normal * 2 : nonAnimWidth
implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Tokens.padding.medium * 2 : nonAnimWidth
color: Colours.palette.m3primaryContainer
radius: Tokens.rounding.medium
@ -146,7 +146,7 @@ Item {
expandedLabel.opacity: 1
smallLabel.opacity: 0
background.implicitWidth: icon.implicitWidth + icon.anchors.leftMargin * 2 + expandedLabel.anchors.leftMargin + expandedLabel.implicitWidth
background.implicitHeight: icon.implicitHeight + root.Tokens.padding.normal * 2
background.implicitHeight: icon.implicitHeight + root.Tokens.padding.medium * 2
item.implicitHeight: background.implicitHeight
}
}
@ -170,7 +170,7 @@ Item {
color: Qt.alpha(Colours.palette.m3secondaryContainer, item.active ? 1 : 0)
implicitWidth: icon.implicitWidth + icon.anchors.leftMargin * 2
implicitHeight: icon.implicitHeight + Tokens.padding.small
implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall
StateLayer {
onClicked: {

6
modules/controlcenter/WindowTitle.qml
View file

@ -10,7 +10,7 @@ StyledRect {
required property ShellScreen screen
required property Session session
implicitHeight: text.implicitHeight + Tokens.padding.normal
implicitHeight: text.implicitHeight + Tokens.padding.medium
color: Colours.tPalette.m3surfaceContainer
StyledText {
@ -28,10 +28,10 @@ StyledRect {
Item {
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
implicitWidth: implicitHeight
implicitHeight: closeIcon.implicitHeight + Tokens.padding.small
implicitHeight: closeIcon.implicitHeight + Tokens.padding.extraSmall
StateLayer {
onClicked: {

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

@ -35,7 +35,7 @@ CollapsibleSection {
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: schemeRow.implicitHeight + Tokens.padding.normal * 2
implicitHeight: schemeRow.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -65,7 +65,7 @@ CollapsibleSection {
id: schemeRow
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal

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

@ -32,7 +32,7 @@ CollapsibleSection {
radius: Tokens.rounding.large
border.width: modelData.variant === Schemes.currentVariant ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: variantRow.implicitHeight + Tokens.padding.normal * 2
implicitHeight: variantRow.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -62,7 +62,7 @@ CollapsibleSection {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal

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

@ -55,7 +55,7 @@ CollapsibleSection {
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilySansRow.implicitHeight + Tokens.padding.normal * 2
implicitHeight: fontFamilySansRow.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -70,7 +70,7 @@ CollapsibleSection {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -136,7 +136,7 @@ CollapsibleSection {
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilyMonoRow.implicitHeight + Tokens.padding.normal * 2
implicitHeight: fontFamilyMonoRow.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -151,7 +151,7 @@ CollapsibleSection {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -219,7 +219,7 @@ CollapsibleSection {
radius: Tokens.rounding.large
border.width: isCurrent ? 1 : 0
border.color: Colours.palette.m3primary
implicitHeight: fontFamilyMaterialRow.implicitHeight + Tokens.padding.normal * 2
implicitHeight: fontFamilyMaterialRow.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -234,7 +234,7 @@ CollapsibleSection {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal

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

@ -94,7 +94,7 @@ Item {
color: Audio.sink?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
radius: Tokens.rounding.large
implicitHeight: outputRowLayout.implicitHeight + Tokens.padding.normal * 2
implicitHeight: outputRowLayout.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -108,7 +108,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -171,7 +171,7 @@ Item {
color: Audio.source?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
radius: Tokens.rounding.large
implicitHeight: inputRowLayout.implicitHeight + Tokens.padding.normal * 2
implicitHeight: inputRowLayout.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -185,7 +185,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -312,7 +312,7 @@ Item {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: muteIcon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: muteIcon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: Audio.muted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@ -339,7 +339,7 @@ Item {
id: outputVolumeSlider
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
value: Audio.volume
enabled: !Audio.muted
@ -430,7 +430,7 @@ Item {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: muteInputIcon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: muteInputIcon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: Audio.sourceMuted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@ -457,7 +457,7 @@ Item {
id: inputVolumeSlider
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
value: Audio.sourceVolume
enabled: !Audio.sourceMuted
@ -564,7 +564,7 @@ Item {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: streamMuteIcon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: streamMuteIcon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: Audio.getStreamMuted(modelData) ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@ -587,7 +587,7 @@ Item {
StyledSlider {
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
value: Audio.getStreamVolume(modelData)
enabled: !Audio.getStreamMuted(modelData)

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

@ -167,7 +167,7 @@ StyledFlickable {
PropertyChanges {
renameDevice.implicitHeight: deviceNameEdit.implicitHeight
renameLabel.opacity: 0
deviceNameEdit.padding: root.Tokens.padding.normal
deviceNameEdit.padding: root.Tokens.padding.medium
}
}
@ -196,7 +196,7 @@ StyledFlickable {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: renameLabel.bottom
anchors.leftMargin: root.session.bt.editingDeviceName ? 0 : -Tokens.padding.normal
anchors.leftMargin: root.session.bt.editingDeviceName ? 0 : -Tokens.padding.medium
text: root.device?.name ?? ""
readOnly: !root.session.bt.editingDeviceName
@ -205,8 +205,8 @@ StyledFlickable {
root.device.name = text;
}
leftPadding: Tokens.padding.normal
rightPadding: Tokens.padding.normal
leftPadding: Tokens.padding.medium
rightPadding: Tokens.padding.medium
background: StyledRect {
radius: Tokens.rounding.medium
@ -231,7 +231,7 @@ StyledFlickable {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer
@ -270,7 +270,7 @@ StyledFlickable {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2
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)
@ -359,7 +359,7 @@ StyledFlickable {
Layout.topMargin: Tokens.spacing.small / 2
Layout.fillWidth: true
Layout.preferredHeight: Tokens.padding.smaller
Layout.preferredHeight: Tokens.padding.small
spacing: Tokens.spacing.small / 2
StyledRect {
@ -435,7 +435,7 @@ StyledFlickable {
ColumnLayout {
anchors.right: fabRoot.right
anchors.bottom: fabRoot.top
anchors.bottomMargin: Tokens.padding.normal
anchors.bottomMargin: Tokens.padding.medium
Repeater {
id: fabMenu
@ -467,7 +467,7 @@ StyledFlickable {
Layout.alignment: Qt.AlignRight
implicitHeight: fabMenuItemInner.implicitHeight + Tokens.padding.larger * 2
implicitHeight: fabMenuItemInner.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.full
color: Colours.palette.m3primaryContainer

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

@ -49,8 +49,8 @@ DeviceList {
icon: "power"
accent: "Tertiary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Toggle Bluetooth")
onClicked: {
@ -65,8 +65,8 @@ DeviceList {
icon: root.smallDiscoverable ? "group_search" : ""
label: root.smallDiscoverable ? "" : qsTr("Discoverable")
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Make discoverable")
onClicked: {
@ -81,8 +81,8 @@ DeviceList {
icon: "missing_controller"
label: root.smallPairable ? "" : qsTr("Pairable")
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Make pairable")
onClicked: {
@ -97,8 +97,8 @@ DeviceList {
icon: "bluetooth_searching"
accent: "Secondary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Scan for devices")
onClicked: {
@ -113,8 +113,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Bluetooth settings")
onClicked: {
@ -137,7 +137,7 @@ DeviceList {
readonly property bool connected: modelData && modelData.state === BluetoothDeviceState.Connected
width: ListView.view ? ListView.view.width : undefined
implicitHeight: deviceInner.implicitHeight + Tokens.padding.normal * 2
implicitHeight: deviceInner.implicitHeight + Tokens.padding.medium * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.large
@ -155,13 +155,13 @@ DeviceList {
id: deviceInner
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledRect {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: icon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: device.connected ? Colours.palette.m3primaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh
@ -211,7 +211,7 @@ DeviceList {
id: connectBtn
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0)

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

@ -127,8 +127,8 @@ ColumnLayout {
property bool expanded
implicitWidth: adapterPicker.implicitWidth + Tokens.padding.normal * 2
implicitHeight: adapterPicker.implicitHeight + Tokens.padding.smaller * 2
implicitWidth: adapterPicker.implicitWidth + Tokens.padding.medium * 2
implicitHeight: adapterPicker.implicitHeight + Tokens.padding.small * 2
StateLayer {
onClicked: {
@ -142,13 +142,13 @@ ColumnLayout {
id: adapterPicker
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.topMargin: Tokens.padding.smaller
anchors.bottomMargin: Tokens.padding.smaller
anchors.margins: Tokens.padding.medium
anchors.topMargin: Tokens.padding.small
anchors.bottomMargin: Tokens.padding.small
spacing: Tokens.spacing.normal
StyledText {
Layout.leftMargin: Tokens.padding.small
Layout.leftMargin: Tokens.padding.extraSmall
text: Bluetooth.defaultAdapter?.name ?? qsTr("None")
}
@ -206,7 +206,7 @@ ColumnLayout {
required property BluetoothAdapter modelData
Layout.fillWidth: true
implicitHeight: adapterInner.implicitHeight + Tokens.padding.normal * 2
implicitHeight: adapterInner.implicitHeight + Tokens.padding.medium * 2
StateLayer {
onClicked: {
@ -223,12 +223,12 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledText {
Layout.fillWidth: true
Layout.leftMargin: Tokens.padding.small
Layout.leftMargin: Tokens.padding.extraSmall
text: adapter.modelData.name
color: Colours.palette.m3onSecondaryContainer
}
@ -305,7 +305,7 @@ ColumnLayout {
PropertyChanges {
renameAdapter.implicitHeight: adapterNameEdit.implicitHeight
renameLabel.opacity: 0
adapterNameEdit.padding: Tokens.padding.normal
adapterNameEdit.padding: Tokens.padding.medium
}
}
@ -334,7 +334,7 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: renameLabel.bottom
anchors.leftMargin: root.session.bt.editingAdapterName ? 0 : -Tokens.padding.normal
anchors.leftMargin: root.session.bt.editingAdapterName ? 0 : -Tokens.padding.medium
text: root.session.bt.currentAdapter?.name ?? ""
readOnly: !root.session.bt.editingAdapterName
@ -342,8 +342,8 @@ ColumnLayout {
root.session.bt.editingAdapterName = false;
}
leftPadding: Tokens.padding.normal
rightPadding: Tokens.padding.normal
leftPadding: Tokens.padding.medium
rightPadding: Tokens.padding.medium
background: StyledRect {
radius: Tokens.rounding.medium
@ -368,7 +368,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer
@ -407,7 +407,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2
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)

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

@ -87,7 +87,7 @@ StyledRect {
inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
// Adjust width similar to utilities toggles
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.small : 0)
onClicked: {
if (modelData.onToggled && root.rootItem && modelData.propertyName) {

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

@ -50,7 +50,7 @@ ColumnLayout {
StyledRect {
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal
implicitHeight: Tokens.padding.medium
radius: Tokens.rounding.full
color: Colours.layer(Colours.palette.m3surfaceContainerHighest, 1)
opacity: root.readonly ? 0.5 : 1.0

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

@ -146,7 +146,7 @@ ColumnLayout {
id: slider
Layout.fillWidth: true
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
from: root.from
to: root.to

16
modules/controlcenter/components/SplitPaneLayout.qml
View file

@ -32,9 +32,9 @@ RowLayout {
id: leftClippingRect
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: 0
anchors.rightMargin: Tokens.padding.normal / 2
anchors.rightMargin: Tokens.padding.medium / 2
radius: leftBorder.innerRadius
color: "transparent"
@ -43,9 +43,9 @@ RowLayout {
id: leftLoader
anchors.fill: parent
anchors.margins: Tokens.padding.large + Tokens.padding.normal
anchors.margins: Tokens.padding.large + Tokens.padding.medium
anchors.leftMargin: Tokens.padding.large
anchors.rightMargin: Tokens.padding.large + Tokens.padding.normal / 2
anchors.rightMargin: Tokens.padding.large + Tokens.padding.medium / 2
asynchronous: true
sourceComponent: root.leftContent
@ -62,7 +62,7 @@ RowLayout {
id: leftBorder
leftThickness: 0
rightThickness: Tokens.padding.normal / 2
rightThickness: Tokens.padding.medium / 2
}
}
@ -76,9 +76,9 @@ RowLayout {
id: rightClippingRect
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: 0
anchors.rightMargin: Tokens.padding.normal / 2
anchors.rightMargin: Tokens.padding.medium / 2
radius: rightBorder.innerRadius
color: "transparent"
@ -103,7 +103,7 @@ RowLayout {
InnerBorder {
id: rightBorder
leftThickness: Tokens.padding.normal / 2
leftThickness: Tokens.padding.medium / 2
}
}
}

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

@ -130,7 +130,7 @@ GridView {
anchors.right: parent.right
anchors.bottom: parent.bottom
implicitHeight: filenameText.implicitHeight + Tokens.padding.normal * 1.5
implicitHeight: filenameText.implicitHeight + Tokens.padding.medium * 1.5
radius: 0
gradient: Gradient {
@ -190,7 +190,7 @@ GridView {
MaterialIcon {
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
visible: isCurrent
text: "check_circle"
@ -205,9 +205,9 @@ GridView {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: Tokens.padding.normal + Tokens.spacing.normal / 2
anchors.rightMargin: Tokens.padding.normal + Tokens.spacing.normal / 2
anchors.bottomMargin: Tokens.padding.normal
anchors.leftMargin: Tokens.padding.medium + Tokens.spacing.normal / 2
anchors.rightMargin: Tokens.padding.medium + Tokens.spacing.normal / 2
anchors.bottomMargin: Tokens.padding.medium
text: modelData.name
font.pointSize: Tokens.font.size.smaller

8
modules/controlcenter/dashboard/DashboardPane.qml
View file

@ -65,9 +65,9 @@ Item {
id: dashboardClippingRect
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: 0
anchors.rightMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.medium
radius: dashboardBorder.innerRadius
color: "transparent"
@ -76,7 +76,7 @@ Item {
id: dashboardLoader
anchors.fill: parent
anchors.margins: Tokens.padding.large + Tokens.padding.normal
anchors.margins: Tokens.padding.large + Tokens.padding.medium
anchors.leftMargin: Tokens.padding.large
anchors.rightMargin: Tokens.padding.large
@ -89,7 +89,7 @@ Item {
id: dashboardBorder
leftThickness: 0
rightThickness: Tokens.padding.normal
rightThickness: Tokens.padding.medium
}
Component {

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

@ -169,8 +169,8 @@ Item {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Launcher settings")
onClicked: {
@ -212,7 +212,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: Tokens.padding.normal
anchors.leftMargin: Tokens.padding.medium
text: "search"
color: Colours.palette.m3onSurfaceVariant
@ -226,8 +226,8 @@ Item {
anchors.leftMargin: Tokens.spacing.small
anchors.rightMargin: Tokens.spacing.small
topPadding: Tokens.padding.normal
bottomPadding: Tokens.padding.normal
topPadding: Tokens.padding.medium
bottomPadding: Tokens.padding.medium
placeholderText: qsTr("Search applications...")
@ -241,7 +241,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.medium
width: searchField.text ? implicitWidth : implicitWidth / 2
opacity: {
@ -337,7 +337,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal

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

@ -40,8 +40,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
if (root.session.ethernet.active)
@ -62,7 +62,7 @@ DeviceList {
readonly property bool isActive: root.activeItem && modelData && root.activeItem.interface === modelData.interface
width: ListView.view ? ListView.view.width : undefined
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
implicitHeight: rowLayout.implicitHeight + Tokens.padding.medium * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, ethernetItem.isActive ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.large
@ -79,13 +79,13 @@ DeviceList {
id: rowLayout
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledRect {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: icon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
@ -141,7 +141,7 @@ DeviceList {
id: connectBtn
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)

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

@ -88,7 +88,7 @@ ColumnLayout {
TextButton {
Layout.fillWidth: true
Layout.topMargin: Tokens.spacing.normal
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
text: qsTr("⚙ Manage VPN Providers")
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer

12
modules/controlcenter/network/NetworkingPane.qml
View file

@ -64,8 +64,8 @@ Item {
icon: "wifi"
accent: "Tertiary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Toggle WiFi")
onClicked: {
@ -78,8 +78,8 @@ Item {
icon: "wifi_find"
accent: "Secondary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Scan for networks")
onClicked: {
@ -92,8 +92,8 @@ Item {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
tooltip: qsTr("Network settings")
onClicked: {

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

@ -96,7 +96,7 @@ DeviceDetails {
TextButton {
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
visible: root.providerEnabled
enabled: !VPN.connecting
inactiveColour: Colours.palette.m3primaryContainer
@ -353,7 +353,7 @@ DeviceDetails {
id: displayNameField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: editVpnDialog.displayName
onTextChanged: editVpnDialog.displayName = text
@ -390,7 +390,7 @@ DeviceDetails {
id: interfaceNameField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: editVpnDialog.interfaceName
onTextChanged: editVpnDialog.interfaceName = text
@ -428,7 +428,7 @@ DeviceDetails {
id: connectCmdFieldEdit
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: editVpnDialog.connectCmd
onTextChanged: editVpnDialog.connectCmd = text
@ -466,7 +466,7 @@ DeviceDetails {
id: disconnectCmdFieldEdit
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: editVpnDialog.disconnectCmd
onTextChanged: editVpnDialog.disconnectCmd = text

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

@ -103,7 +103,7 @@ ColumnLayout {
required property int index
width: ListView.view ? ListView.view.width : undefined
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
implicitHeight: rowLayout.implicitHeight + Tokens.padding.medium * 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.large
@ -122,13 +122,13 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledRect {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: icon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: modelData.enabled && VPN.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
@ -205,7 +205,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, VPN.connected && modelData.enabled ? 1 : 0)
@ -265,7 +265,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: deleteIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: deleteIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: "transparent"
@ -609,7 +609,7 @@ ColumnLayout {
id: displayNameField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: vpnDialog.displayName
onTextChanged: vpnDialog.displayName = text
@ -646,7 +646,7 @@ ColumnLayout {
id: interfaceNameField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: vpnDialog.interfaceName
onTextChanged: vpnDialog.interfaceName = text
@ -684,7 +684,7 @@ ColumnLayout {
id: connectCmdField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: vpnDialog.connectCmd
onTextChanged: vpnDialog.connectCmd = text
@ -722,7 +722,7 @@ ColumnLayout {
id: disconnectCmdField
anchors.centerIn: parent
width: parent.width - Tokens.padding.normal
width: parent.width - Tokens.padding.medium
horizontalAlignment: TextInput.AlignLeft
text: vpnDialog.disconnectCmd
onTextChanged: vpnDialog.disconnectCmd = text

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

@ -89,7 +89,7 @@ ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
MaterialIcon {

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

@ -87,7 +87,7 @@ DeviceDetails {
TextButton {
Layout.fillWidth: true
Layout.topMargin: Tokens.spacing.normal
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
visible: {
if (!root.network || !root.network.ssid) {
return false;

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

@ -65,8 +65,8 @@ DeviceList {
icon: "wifi"
accent: "Tertiary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
Nmcli.toggleWifi(null);
@ -78,8 +78,8 @@ DeviceList {
icon: "wifi_find"
accent: "Secondary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
Nmcli.rescanWifi();
@ -91,8 +91,8 @@ DeviceList {
icon: "settings"
accent: "Primary"
iconSize: Tokens.font.size.normal
horizontalPadding: Tokens.padding.normal
verticalPadding: Tokens.padding.smaller
horizontalPadding: Tokens.padding.medium
verticalPadding: Tokens.padding.small
onClicked: {
if (root.session.network.active)
@ -110,7 +110,7 @@ DeviceList {
required property var modelData
width: ListView.view ? ListView.view.width : undefined
implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
implicitHeight: rowLayout.implicitHeight + Tokens.padding.medium * 2
color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
radius: Tokens.rounding.large
@ -130,13 +130,13 @@ DeviceList {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
StyledRect {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: icon.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: modelData.active ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
@ -191,7 +191,7 @@ DeviceList {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0)

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

@ -195,7 +195,7 @@ Item {
Layout.topMargin: Tokens.spacing.large
Layout.fillWidth: true
implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.normal * 2)
implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.medium * 2)
focus: true
Keys.onPressed: event => {
if (!activeFocus) {
@ -398,7 +398,7 @@ Item {
id: cancelButton
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3secondaryContainer
inactiveOnColour: Colours.palette.m3onSecondaryContainer
text: qsTr("Cancel")
@ -413,7 +413,7 @@ Item {
property bool hasError: false
Layout.fillWidth: true
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.normal * 2
Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2
inactiveColour: Colours.palette.m3primary
inactiveOnColour: Colours.palette.m3onPrimary
text: qsTr("Connect")

8
modules/controlcenter/notifications/NotificationsPane.qml
View file

@ -64,9 +64,9 @@ Item {
id: notificationsClippingRect
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: 0
anchors.rightMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.medium
color: "transparent"
radius: notificationsBorder.innerRadius
@ -75,7 +75,7 @@ Item {
id: notificationsLoader
anchors.fill: parent
anchors.margins: Tokens.padding.large + Tokens.padding.normal
anchors.margins: Tokens.padding.large + Tokens.padding.medium
anchors.leftMargin: Tokens.padding.large
anchors.rightMargin: Tokens.padding.large
@ -87,7 +87,7 @@ Item {
id: notificationsBorder
leftThickness: 0
rightThickness: Tokens.padding.normal
rightThickness: Tokens.padding.medium
}
Component {

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

@ -125,9 +125,9 @@ Item {
id: taskbarClippingRect
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
anchors.leftMargin: 0
anchors.rightMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.medium
radius: taskbarBorder.innerRadius
color: "transparent"
@ -136,7 +136,7 @@ Item {
id: taskbarLoader
anchors.fill: parent
anchors.margins: Tokens.padding.large + Tokens.padding.normal
anchors.margins: Tokens.padding.large + Tokens.padding.medium
anchors.leftMargin: Tokens.padding.large
anchors.rightMargin: Tokens.padding.large
@ -149,7 +149,7 @@ Item {
id: taskbarBorder
leftThickness: 0
rightThickness: Tokens.padding.normal
rightThickness: Tokens.padding.medium
}
Component {

2
modules/dashboard/Content.qml
View file

@ -66,7 +66,7 @@ Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: Tokens.padding.normal
anchors.topMargin: Tokens.padding.medium
anchors.margins: Tokens.padding.large
nonAnimWidth: root.nonAnimWidth - anchors.margins * 2

12
modules/dashboard/LyricMenu.qml
View file

@ -35,7 +35,7 @@ StyledRect {
// Header: icon, backend selector, refresh, toggle
RowLayout {
Layout.fillWidth: true
spacing: Tokens.padding.small
spacing: Tokens.padding.extraSmall
MaterialIcon {
text: "lyrics"
@ -120,7 +120,7 @@ StyledRect {
ColumnLayout {
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
spacing: 0
StyledText {
@ -228,7 +228,7 @@ StyledRect {
Row {
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.small
// Active indicator bar
@ -286,7 +286,7 @@ StyledRect {
// Manual search
ColumnLayout {
Layout.fillWidth: true
spacing: Tokens.padding.small
spacing: Tokens.padding.extraSmall
StyledText {
Layout.fillWidth: true
@ -298,7 +298,7 @@ StyledRect {
RowLayout {
Layout.fillWidth: true
spacing: Tokens.padding.small
spacing: Tokens.padding.extraSmall
StyledInputField {
id: searchTitle
@ -336,7 +336,7 @@ StyledRect {
// Offset controls
RowLayout {
Layout.fillWidth: true
spacing: Tokens.padding.small
spacing: Tokens.padding.extraSmall
MaterialIcon {
text: "contrast_square"

10
modules/dashboard/Media.qml
View file

@ -284,7 +284,7 @@ Item {
icon: Players.active?.isPlaying ? "pause" : "play_arrow"
label.animate: true
toggle: true
padding: Tokens.padding.small / 2
padding: Tokens.padding.extraSmall / 2
checked: Players.active?.isPlaying ?? false
font.pointSize: Math.round(Tokens.font.size.large * 1.5)
disabled: !Players.active?.canTogglePlaying
@ -312,7 +312,7 @@ Item {
enabled: !!Players.active
implicitWidth: 280
implicitHeight: Tokens.padding.normal * 3
implicitHeight: Tokens.padding.medium * 3
onMoved: {
const active = Players.active;
@ -443,7 +443,7 @@ Item {
type: IconButton.Text
icon: "move_up"
inactiveOnColour: Colours.palette.m3secondary
padding: Tokens.padding.small
padding: Tokens.padding.extraSmall
font.pointSize: Tokens.font.size.large
disabled: !Players.active?.canRaise
onClicked: {
@ -482,7 +482,7 @@ Item {
type: IconButton.Text
icon: "delete"
inactiveOnColour: Colours.palette.m3error
padding: Tokens.padding.small
padding: Tokens.padding.extraSmall
font.pointSize: Tokens.font.size.large
disabled: !Players.active?.canQuit
onClicked: Players.active?.quit()
@ -498,7 +498,7 @@ Item {
}
component PlayerControl: IconButton {
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.small : 0)
radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : implicitHeight / 2
radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial
radiusAnim.easing: Tokens.anim.expressiveFastSpatial

8
modules/dashboard/WeatherTab.qml
View file

@ -66,7 +66,7 @@ Item {
StyledRect {
Layout.fillWidth: true
implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small * 2
implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.extraLarge * 2
color: Colours.tPalette.m3surfaceContainer
@ -97,7 +97,7 @@ Item {
}
StyledText {
Layout.leftMargin: Tokens.padding.small
Layout.leftMargin: Tokens.padding.extraSmall
text: Weather.description
font.pointSize: Tokens.font.size.normal
color: Colours.palette.m3onSurfaceVariant
@ -132,7 +132,7 @@ Item {
StyledText {
Layout.topMargin: Tokens.spacing.normal
Layout.leftMargin: Tokens.padding.normal
Layout.leftMargin: Tokens.padding.medium
visible: forecastRepeater.count > 0
text: qsTr("7-Day Forecast")
font.pointSize: Tokens.font.size.normal
@ -156,7 +156,7 @@ Item {
required property var modelData
Layout.fillWidth: true
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.normal * 2
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer

16
modules/dashboard/dash/Calendar.qml
View file

@ -46,7 +46,7 @@ CustomMouseArea {
Item {
implicitWidth: implicitHeight
implicitHeight: prevMonthText.implicitHeight + Tokens.padding.small * 2
implicitHeight: prevMonthText.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
id: prevMonthStateLayer
@ -69,8 +69,8 @@ CustomMouseArea {
Item {
Layout.fillWidth: true
implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.small * 2
implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.small * 2
implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.extraSmall * 2
implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
onClicked: {
@ -78,9 +78,9 @@ CustomMouseArea {
}
anchors.fill: monthYearDisplay
anchors.margins: -Tokens.padding.small
anchors.leftMargin: -Tokens.padding.normal
anchors.rightMargin: -Tokens.padding.normal
anchors.margins: -Tokens.padding.extraSmall
anchors.leftMargin: -Tokens.padding.medium
anchors.rightMargin: -Tokens.padding.medium
radius: Tokens.rounding.full
disabled: {
@ -103,7 +103,7 @@ CustomMouseArea {
Item {
implicitWidth: implicitHeight
implicitHeight: nextMonthText.implicitHeight + Tokens.padding.small * 2
implicitHeight: nextMonthText.implicitHeight + Tokens.padding.extraSmall * 2
StateLayer {
id: nextMonthStateLayer
@ -164,7 +164,7 @@ CustomMouseArea {
required property var model
implicitWidth: implicitHeight
implicitHeight: text.implicitHeight + Tokens.padding.small * 2
implicitHeight: text.implicitHeight + Tokens.padding.extraSmall * 2
StyledText {
id: text

2
modules/dashboard/dash/Media.qml
View file

@ -218,7 +218,7 @@ Item {
signal clicked
implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Tokens.padding.small
implicitWidth: Math.max(icon.implicitHeight, icon.implicitHeight) + Tokens.padding.extraSmall
implicitHeight: implicitWidth
StateLayer {

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

@ -60,8 +60,8 @@ Row {
StyledRect {
anchors.centerIn: parent
implicitWidth: selectIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: selectIcon.implicitHeight + Tokens.padding.small * 2
implicitWidth: selectIcon.implicitHeight + Tokens.padding.extraSmall * 2
implicitHeight: selectIcon.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.large
color: Colours.palette.m3primary

2
modules/drawers/Panels.qml
View file

@ -138,7 +138,7 @@ Item {
anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
anchors.right: sidebar.left
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
}
Sidebar.Wrapper {

4
modules/launcher/Content.qml
View file

@ -75,8 +75,8 @@ Item {
anchors.leftMargin: Tokens.spacing.small
anchors.rightMargin: Tokens.spacing.small
topPadding: Tokens.padding.larger
bottomPadding: Tokens.padding.larger
topPadding: Tokens.padding.medium
bottomPadding: Tokens.padding.medium
placeholderText: qsTr("Type \"%1\" for commands").arg(GlobalConfig.launcher.actionPrefix)

2
modules/launcher/WallpaperList.qml
View file

@ -15,7 +15,7 @@ PathView {
required property var panels
required property var content
readonly property int itemWidth: Tokens.sizes.launcher.wallpaperWidth * 0.8 + Tokens.padding.larger * 2
readonly property int itemWidth: Tokens.sizes.launcher.wallpaperWidth * 0.8 + Tokens.padding.medium * 2
readonly property int numItems: {
const screen = (QsWindow.window as QsWindow)?.screen;

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

@ -21,9 +21,9 @@ Item {
Item {
anchors.fill: parent
anchors.leftMargin: Tokens.padding.larger
anchors.rightMargin: Tokens.padding.larger
anchors.margins: Tokens.padding.smaller
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
anchors.margins: Tokens.padding.small
MaterialIcon {
id: icon

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

@ -28,9 +28,9 @@ Item {
Item {
anchors.fill: parent
anchors.leftMargin: Tokens.padding.larger
anchors.rightMargin: Tokens.padding.larger
anchors.margins: Tokens.padding.smaller
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
anchors.margins: Tokens.padding.small
IconImage {
id: icon

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

@ -36,7 +36,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Tokens.padding.larger
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -69,8 +69,8 @@ Item {
radius: Tokens.rounding.large
clip: true
implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.normal * 2
implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.small * 2
implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.medium * 2
implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.extraSmall * 2
Layout.alignment: Qt.AlignVCenter
@ -108,7 +108,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: Tokens.padding.normal
anchors.rightMargin: Tokens.padding.medium
text: "open_in_new"
color: Colours.palette.m3onTertiary

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

@ -22,9 +22,9 @@ Item {
Item {
anchors.fill: parent
anchors.leftMargin: Tokens.padding.larger
anchors.rightMargin: Tokens.padding.larger
anchors.margins: Tokens.padding.smaller
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
anchors.margins: Tokens.padding.small
StyledRect {
id: preview

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

@ -22,9 +22,9 @@ Item {
Item {
anchors.fill: parent
anchors.leftMargin: Tokens.padding.larger
anchors.rightMargin: Tokens.padding.larger
anchors.margins: Tokens.padding.smaller
anchors.leftMargin: Tokens.padding.medium
anchors.rightMargin: Tokens.padding.medium
anchors.margins: Tokens.padding.small
MaterialIcon {
id: icon

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

@ -21,8 +21,8 @@ Item {
opacity = Qt.binding(() => PathView.onPath ? 1 : 0);
}
implicitWidth: image.width + Tokens.padding.larger * 2
implicitHeight: image.height + label.height + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.normal
implicitWidth: image.width + Tokens.padding.medium * 2
implicitHeight: image.height + label.height + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.medium
StateLayer {
radius: Tokens.rounding.large
@ -78,7 +78,7 @@ Item {
anchors.topMargin: Tokens.spacing.small / 2
anchors.horizontalCenter: parent.horizontalCenter
width: image.width - Tokens.padding.normal * 2
width: image.width - Tokens.padding.medium * 2
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
renderType: Text.QtRendering

8
modules/lock/Center.qml
View file

@ -113,7 +113,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter
implicitWidth: root.centerWidth * 0.8
implicitHeight: input.implicitHeight + Tokens.padding.small * 2
implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2
color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full
@ -147,12 +147,12 @@ ColumnLayout {
id: input
anchors.fill: parent
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
spacing: Tokens.spacing.normal
Item {
implicitWidth: implicitHeight
implicitHeight: fprintIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: fprintIcon.implicitHeight + Tokens.padding.extraSmall * 2
MaterialIcon {
id: fprintIcon
@ -188,7 +188,7 @@ ColumnLayout {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: enterIcon.implicitHeight + Tokens.padding.small * 2
implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2
color: root.lock.pam.buffer ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
radius: Tokens.rounding.full

8
modules/lock/Fetch.qml
View file

@ -24,8 +24,8 @@ ColumnLayout {
spacing: Tokens.spacing.normal
StyledRect {
implicitWidth: prompt.implicitWidth + Tokens.padding.normal * 2
implicitHeight: prompt.implicitHeight + Tokens.padding.normal * 2
implicitWidth: prompt.implicitWidth + Tokens.padding.medium * 2
implicitHeight: prompt.implicitHeight + Tokens.padding.medium * 2
color: Colours.palette.m3primary
radius: Tokens.rounding.medium
@ -71,8 +71,8 @@ ColumnLayout {
ColumnLayout {
Layout.fillWidth: true
Layout.topMargin: Tokens.padding.normal
Layout.bottomMargin: Tokens.padding.normal
Layout.topMargin: Tokens.padding.medium
Layout.bottomMargin: Tokens.padding.medium
Layout.leftMargin: iconLoader.active ? 0 : width * 0.1
spacing: Tokens.spacing.normal

4
modules/lock/Media.qml
View file

@ -150,9 +150,9 @@ Item {
signal clicked
Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.normal * 2 : active ? Tokens.padding.small * 2 : 0)
Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.medium * 2 : active ? Tokens.padding.extraSmall * 2 : 0)
implicitWidth: controlIcon.implicitWidth + Tokens.padding.large * 2
implicitHeight: controlIcon.implicitHeight + Tokens.padding.normal * 2
implicitHeight: controlIcon.implicitHeight + Tokens.padding.medium * 2
color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`]
radius: active || controlState.pressed ? Tokens.rounding.large : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale)

16
modules/lock/NotifGroup.qml
View file

@ -46,7 +46,7 @@ StyledRect {
anchors.left: parent?.left
anchors.right: parent?.right
implicitHeight: content.implicitHeight + Tokens.padding.normal * 2
implicitHeight: content.implicitHeight + Tokens.padding.medium * 2
clip: true
radius: Tokens.rounding.large
@ -58,7 +58,7 @@ StyledRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -140,8 +140,8 @@ StyledRect {
}
ColumnLayout {
Layout.topMargin: -Tokens.padding.small
Layout.bottomMargin: -Tokens.padding.small / 2 - (root.expanded ? 0 : spacing)
Layout.topMargin: -Tokens.padding.extraSmall
Layout.bottomMargin: -Tokens.padding.extraSmall / 2 - (root.expanded ? 0 : spacing)
Layout.fillWidth: true
spacing: Math.round(Tokens.spacing.small / 2)
@ -166,8 +166,8 @@ StyledRect {
}
StyledRect {
implicitWidth: expandBtn.implicitWidth + Tokens.padding.smaller * 2
implicitHeight: groupCount.implicitHeight + Tokens.padding.small
implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2
implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
color: root.urgency === "critical" ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
radius: Tokens.rounding.full
@ -189,7 +189,7 @@ StyledRect {
StyledText {
id: groupCount
Layout.leftMargin: Tokens.padding.small / 2
Layout.leftMargin: Tokens.padding.extraSmall / 2
animate: true
text: root.notifs.length
color: root.urgency === "critical" ? Colours.palette.m3onError : Colours.palette.m3onSurface
@ -197,7 +197,7 @@ StyledRect {
}
MaterialIcon {
Layout.rightMargin: -Tokens.padding.small / 2
Layout.rightMargin: -Tokens.padding.extraSmall / 2
animate: true
text: root.expanded ? "expand_less" : "expand_more"
color: root.urgency === "critical" ? Colours.palette.m3onError : Colours.palette.m3onSurface

2
modules/lock/Resources.qml
View file

@ -71,7 +71,7 @@ GridLayout {
padding: Tokens.padding.large * 3
fgColour: res.colour
bgColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 3)
strokeWidth: width < 200 ? Tokens.padding.smaller : Tokens.padding.normal
strokeWidth: width < 200 ? Tokens.padding.small : Tokens.padding.medium
}
MaterialIcon {

2
modules/lock/WeatherInfo.qml
View file

@ -72,7 +72,7 @@ ColumnLayout {
Loader {
asynchronous: true
Layout.rightMargin: Tokens.padding.smaller
Layout.rightMargin: Tokens.padding.small
active: root.width > 400
visible: active

16
modules/notifications/Notification.qml
View file

@ -94,7 +94,7 @@ StyledRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
implicitHeight: root.nonAnimHeight
@ -206,9 +206,9 @@ StyledRect {
PathAngleArc {
id: progressArc
radiusX: progressIndicator.width / 2 - root.Tokens.padding.small / 2
radiusX: progressIndicator.width / 2 - root.Tokens.padding.extraSmall / 2
centerX: progressIndicator.width / 2
radiusY: progressIndicator.height / 2 - root.Tokens.padding.small / 2
radiusY: progressIndicator.height / 2 - root.Tokens.padding.extraSmall / 2
centerY: progressIndicator.height / 2
startAngle: -90
@ -478,10 +478,10 @@ StyledRect {
radius: Tokens.rounding.full
color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
Layout.preferredWidth: actionText.width + Tokens.padding.normal * 2
Layout.preferredHeight: actionText.height + Tokens.padding.small * 2
implicitWidth: actionText.width + Tokens.padding.normal * 2
implicitHeight: actionText.height + Tokens.padding.small * 2
Layout.preferredWidth: actionText.width + Tokens.padding.medium * 2
Layout.preferredHeight: actionText.height + Tokens.padding.extraSmall * 2
implicitWidth: actionText.width + Tokens.padding.medium * 2
implicitHeight: actionText.height + Tokens.padding.extraSmall * 2
StateLayer {
radius: Tokens.rounding.full
@ -507,7 +507,7 @@ StyledRect {
elide: Text.ElideRight
elideWidth: {
const numActions = root.modelData.actions.length + 1;
return (inner.width - actions.spacing * (numActions - 1)) / numActions - root.Tokens.padding.normal * 2;
return (inner.width - actions.spacing * (numActions - 1)) / numActions - root.Tokens.padding.medium * 2;
}
}
}

14
modules/sidebar/Notif.qml
View file

@ -16,7 +16,7 @@ StyledRect {
required property DrawerVisibilities visibilities
readonly property StyledText body: (expandedContent.item as ExpandedBody)?.body ?? null
readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Tokens.padding.normal * 2 : summaryHeightMetrics.height
readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Tokens.padding.medium * 2 : summaryHeightMetrics.height
implicitHeight: nonAnimHeight
@ -32,12 +32,12 @@ StyledRect {
name: "expanded"
PropertyChanges {
summary.anchors.margins: root.Tokens.padding.normal
dummySummary.anchors.margins: root.Tokens.padding.normal
compactBody.anchors.margins: root.Tokens.padding.normal
timeStr.anchors.margins: root.Tokens.padding.normal
expandedContent.anchors.margins: root.Tokens.padding.normal
summary.width: root.width - root.Tokens.padding.normal * 2 - timeStr.implicitWidth - root.Tokens.spacing.small
summary.anchors.margins: root.Tokens.padding.medium
dummySummary.anchors.margins: root.Tokens.padding.medium
compactBody.anchors.margins: root.Tokens.padding.medium
timeStr.anchors.margins: root.Tokens.padding.medium
expandedContent.anchors.margins: root.Tokens.padding.medium
summary.width: root.width - root.Tokens.padding.medium * 2 - timeStr.implicitWidth - root.Tokens.spacing.small
summary.maximumLineCount: Number.MAX_SAFE_INTEGER
}
}

4
modules/sidebar/NotifActionList.qml
View file

@ -114,8 +114,8 @@ Item {
Layout.fillWidth: true
Layout.fillHeight: true
implicitWidth: actionInner.implicitWidth + Tokens.padding.normal * 2
implicitHeight: actionInner.implicitHeight + Tokens.padding.small * 2
implicitWidth: actionInner.implicitWidth + Tokens.padding.medium * 2
implicitHeight: actionInner.implicitHeight + Tokens.padding.extraSmall * 2
Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Tokens.padding.large : 0)
radius: actionStateLayer.pressed ? Tokens.rounding.medium / 2 : Tokens.rounding.medium

8
modules/sidebar/NotifDock.qml
View file

@ -19,7 +19,7 @@ Item {
readonly property int notifCount: Notifs.list.reduce((acc, n) => n.closed ? acc : acc + 1, 0)
anchors.fill: parent
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
Component.onCompleted: Notifs.list.forEach(n => n.popup = false)
@ -29,7 +29,7 @@ Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: Tokens.padding.small
anchors.margins: Tokens.padding.extraSmall
implicitHeight: Math.max(count.implicitHeight, titleText.implicitHeight)
@ -177,7 +177,7 @@ Item {
asynchronous: true
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
scale: root.notifCount > 0 ? 1 : 0.5
opacity: root.notifCount > 0 ? 1 : 0
@ -188,7 +188,7 @@ Item {
icon: "clear_all"
radius: Tokens.rounding.large
padding: Tokens.padding.normal
padding: Tokens.padding.medium
font.pointSize: Math.round(Tokens.font.size.large * 1.2)
onClicked: clearTimer.start()

14
modules/sidebar/NotifGroup.qml
View file

@ -34,7 +34,7 @@ StyledRect {
readonly property int nonAnimHeight: {
const headerHeight = header.implicitHeight + (root.expanded ? Math.round(Tokens.spacing.small / 2) : 0);
const columnHeight = headerHeight + notifList.layoutHeight;
return Math.round(Math.max(TokenConfig.sizes.notifs.image, columnHeight) + Tokens.padding.normal * 2);
return Math.round(Math.max(TokenConfig.sizes.notifs.image, columnHeight) + Tokens.padding.medium * 2);
}
readonly property bool expanded: props.expandedNotifs.includes(modelData)
@ -72,7 +72,7 @@ StyledRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: Tokens.padding.normal
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
@ -186,8 +186,8 @@ StyledRect {
}
StyledRect {
implicitWidth: expandBtn.implicitWidth + Tokens.padding.smaller * 2
implicitHeight: groupCount.implicitHeight + Tokens.padding.small
implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2
implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHigh, 3)
radius: Tokens.rounding.full
@ -206,7 +206,7 @@ StyledRect {
StyledText {
id: groupCount
Layout.leftMargin: Tokens.padding.small / 2
Layout.leftMargin: Tokens.padding.extraSmall / 2
animate: true
text: root.notifCount
color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface
@ -214,11 +214,11 @@ StyledRect {
}
MaterialIcon {
Layout.rightMargin: -Tokens.padding.small / 2
Layout.rightMargin: -Tokens.padding.extraSmall / 2
text: "expand_more"
color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface
rotation: root.expanded ? 180 : 0
Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.smaller / 2) : 0
Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.small / 2) : 0
Behavior on rotation {
Anim {

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

@ -26,7 +26,7 @@ StyledRect {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2
implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
radius: Tokens.rounding.full
color: IdleInhibitor.enabled ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@ -83,8 +83,8 @@ StyledRect {
Component.onCompleted: active = Qt.binding(() => opacity > 0)
sourceComponent: StyledRect {
implicitWidth: activeText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: activeText.implicitHeight + Tokens.padding.small * 2
implicitWidth: activeText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: activeText.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.full
color: Colours.palette.m3primary

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

@ -33,7 +33,7 @@ StyledRect {
StyledRect {
implicitWidth: implicitHeight
implicitHeight: {
const h = icon.implicitHeight + Tokens.padding.smaller * 2;
const h = icon.implicitHeight + Tokens.padding.small * 2;
return h - (h % 2);
}
@ -193,8 +193,8 @@ StyledRect {
radius: Tokens.rounding.full
color: Recorder.paused ? Colours.palette.m3tertiary : Colours.palette.m3error
implicitWidth: recText.implicitWidth + Tokens.padding.normal * 2
implicitHeight: recText.implicitHeight + Tokens.padding.smaller * 2
implicitWidth: recText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: recText.implicitHeight + Tokens.padding.small * 2
StyledText {
id: recText

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

@ -62,7 +62,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.rightMargin: -Tokens.spacing.small
implicitHeight: (Tokens.font.size.larger + Tokens.padding.small) * (root.props.recordingListExpanded ? 10 : 3)
implicitHeight: (Tokens.font.size.larger + Tokens.padding.extraSmall) * (root.props.recordingListExpanded ? 10 : 3)
clip: true
StyledScrollBar.vertical: StyledScrollBar {

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

@ -154,7 +154,7 @@ StyledRect {
component Toggle: IconButton {
Layout.fillWidth: true
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.small : 0)
radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : Tokens.rounding.large
inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
toggle: true

Some files were not shown because too many files have changed in this diff Show more