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

refactor: replace scaled padding with new tokens

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-20 19:25:20 +10:00
parent 57db6e246c
commit 0d0dcaf115
72 changed files with 144 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/SectionContainer.qml
View file

@ -12,7 +12,7 @@ StyledRect {
property bool alignTop: false property bool alignTop: false
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: contentColumn.implicitHeight + Tokens.padding.large * 2 implicitHeight: contentColumn.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh

4
components/controls/CustomSpinBox.qml
View file

@ -89,7 +89,7 @@ RowLayout {
color: Colours.palette.m3primary color: Colours.palette.m3primary
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: upIcon.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
id: upState id: upState
@ -124,7 +124,7 @@ RowLayout {
color: Colours.palette.m3primary color: Colours.palette.m3primary
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: downIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: downIcon.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
id: downState id: downState

2
components/controls/SpinBoxRow.qml
View file

@ -15,7 +15,7 @@ StyledRect {
property var onValueModified: function (value) {} property var onValueModified: function (value) {}
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2 implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)

2
components/controls/SplitButtonRow.qml
View file

@ -20,7 +20,7 @@ StyledRect {
signal selected(item: MenuItem) signal selected(item: MenuItem)
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2 implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)

2
components/controls/StyledInputField.qml
View file

@ -21,7 +21,7 @@ Item {
signal editingFinished signal editingFinished
implicitWidth: 70 implicitWidth: 70
implicitHeight: inputField.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: inputField.implicitHeight + Tokens.padding.small
StyledRect { StyledRect {
id: container id: container

4
components/controls/StyledSwitch.qml
View file

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

2
components/controls/SwitchRow.qml
View file

@ -13,7 +13,7 @@ StyledRect {
signal toggled(checked: bool) signal toggled(checked: bool)
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: row.implicitHeight + Tokens.padding.large * 2 implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)

2
components/controls/ToggleButton.qml
View file

@ -24,7 +24,7 @@ StyledRect {
Component.onCompleted: hovered = toggleStateLayer.containsMouse Component.onCompleted: hovered = toggleStateLayer.containsMouse
Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.medium * 2 : toggled ? Tokens.padding.extraSmall * 2 : 0) Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.medium * 2 : toggled ? Tokens.padding.small : 0)
implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2 implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2
implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2 implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2
radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale) radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)

2
components/controls/Tooltip.qml
View file

@ -117,7 +117,7 @@ Popup {
id: tooltipRect id: tooltipRect
implicitWidth: tooltipText.implicitWidth + Tokens.padding.medium * 2 implicitWidth: tooltipText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: tooltipText.implicitHeight + Tokens.padding.small * 2 implicitHeight: tooltipText.implicitHeight + Tokens.padding.large
color: Colours.palette.m3surfaceContainerHighest color: Colours.palette.m3surfaceContainerHighest
radius: Tokens.rounding.medium radius: Tokens.rounding.medium

4
components/filedialog/HeaderBar.qml
View file

@ -25,7 +25,7 @@ StyledRect {
Item { Item {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: upIcon.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
@ -84,7 +84,7 @@ StyledRect {
Item { Item {
implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.extraSmall : 0) + folderName.implicitWidth + Tokens.padding.medium * 2 implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.extraSmall : 0) + folderName.implicitWidth + Tokens.padding.medium * 2
implicitHeight: folderName.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: folderName.implicitHeight + Tokens.padding.small
Loader { Loader {
asynchronous: true asynchronous: true

2
components/widgets/ExtraIndicator.qml
View file

@ -14,7 +14,7 @@ StyledRect {
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
implicitWidth: count.implicitWidth + Tokens.padding.medium * 2 implicitWidth: count.implicitWidth + Tokens.padding.medium * 2
implicitHeight: count.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: count.implicitHeight + Tokens.padding.small
opacity: extra > 0 ? 1 : 0 opacity: extra > 0 ? 1 : 0
scale: extra > 0 ? 1 : 0.5 scale: extra > 0 ? 1 : 0.5

4
modules/background/Background.qml
View file

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

2
modules/background/DesktopClock.qml
View file

@ -24,7 +24,7 @@ Item {
readonly property color safeTertiary: useLightSet ? Colours.palette.m3tertiaryContainer : Colours.palette.m3tertiary readonly property color safeTertiary: useLightSet ? Colours.palette.m3tertiaryContainer : Colours.palette.m3tertiary
implicitWidth: layout.implicitWidth + (Tokens.padding.large * 4 * root.clockScale) implicitWidth: layout.implicitWidth + (Tokens.padding.large * 4 * root.clockScale)
implicitHeight: layout.implicitHeight + (Tokens.padding.large * 2 * root.clockScale) implicitHeight: layout.implicitHeight + (Tokens.padding.extraLargeIncreased * root.clockScale)
Item { Item {
id: clockContainer id: clockContainer

4
modules/background/Wallpaper.qml
View file

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

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

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

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

@ -91,7 +91,7 @@ StyledRect {
sourceComponent: Item { sourceComponent: Item {
implicitWidth: expandIconInner.implicitWidth implicitWidth: expandIconInner.implicitWidth
implicitHeight: expandIconInner.implicitHeight - Tokens.padding.extraSmall * 2 implicitHeight: expandIconInner.implicitHeight - Tokens.padding.small
MaterialIcon { MaterialIcon {
id: expandIconInner id: expandIconInner

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

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

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

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

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

@ -284,7 +284,7 @@ Item {
asynchronous: true asynchronous: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2 Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small
sourceComponent: ws.icon.length === 1 ? letterComp : iconComp sourceComponent: ws.icon.length === 1 ? letterComp : iconComp

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

@ -33,7 +33,7 @@ ColumnLayout {
id: indicator id: indicator
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2 Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small
animate: true animate: true
text: { text: {

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

@ -28,7 +28,7 @@ StyledClippingRect {
property real blur: onSpecial ? 1 : 0 property real blur: onSpecial ? 1 : 0
implicitWidth: Tokens.sizes.bar.innerWidth implicitWidth: Tokens.sizes.bar.innerWidth
implicitHeight: layout.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: layout.implicitHeight + Tokens.padding.small
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full radius: Tokens.rounding.full

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

@ -12,7 +12,7 @@ Item {
required property PopoutState popouts required property PopoutState popouts
implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Tokens.padding.large * 2 implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Tokens.padding.extraLargeIncreased
implicitHeight: child.implicitHeight implicitHeight: child.implicitHeight
Column { Column {
@ -59,8 +59,8 @@ Item {
} }
Item { Item {
implicitWidth: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitWidth: expandIcon.implicitHeight + Tokens.padding.small
implicitHeight: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: expandIcon.implicitHeight + Tokens.padding.small
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter

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

@ -46,7 +46,7 @@ Column {
sourceComponent: StyledRect { sourceComponent: StyledRect {
implicitWidth: child.implicitWidth + Tokens.padding.medium * 2 implicitWidth: child.implicitWidth + Tokens.padding.medium * 2
implicitHeight: child.implicitHeight + Tokens.padding.small * 2 implicitHeight: child.implicitHeight + Tokens.padding.large
color: Colours.palette.m3error color: Colours.palette.m3error
radius: Tokens.rounding.large radius: Tokens.rounding.large
@ -110,7 +110,7 @@ Column {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.medium * 2 + Tokens.spacing.large * 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 implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.small
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full radius: Tokens.rounding.full
@ -199,8 +199,8 @@ Column {
required property string icon required property string icon
required property int profile required property int profile
implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall * 2 implicitWidth: icon.implicitHeight + Tokens.padding.small
implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: icon.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
radius: Tokens.rounding.full radius: Tokens.rounding.full

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

@ -14,8 +14,8 @@ Item {
readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
readonly property Item current: currentPopout?.item ?? null readonly property Item current: currentPopout?.item ?? null
implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.large * 2 implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.extraLargeIncreased
implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.large * 2 implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.extraLargeIncreased
Item { Item {
id: content id: content

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

@ -167,7 +167,7 @@ ColumnLayout {
Layout.preferredHeight: visible ? implicitHeight : 0 Layout.preferredHeight: visible ? implicitHeight : 0
Layout.topMargin: visible ? Tokens.spacing.small : 0 Layout.topMargin: visible ? Tokens.spacing.small : 0
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: rescanBtn.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: rescanBtn.implicitHeight + Tokens.padding.small
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Colours.palette.m3primaryContainer color: Colours.palette.m3primaryContainer
@ -209,7 +209,7 @@ ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
strokeWidth: Tokens.padding.extraSmall / 2 strokeWidth: Tokens.padding.extraSmall / 2
bgColour: "transparent" bgColour: "transparent"
implicitSize: parent.implicitHeight - Tokens.padding.small * 2 implicitSize: parent.implicitHeight - Tokens.padding.large
running: Nmcli.scanning running: Nmcli.scanning
} }
} }

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

@ -191,7 +191,7 @@ StackView {
anchors.fill: parent anchors.fill: parent
anchors.margins: -Tokens.padding.extraSmall / 2 anchors.margins: -Tokens.padding.extraSmall / 2
anchors.leftMargin: -Tokens.padding.small anchors.leftMargin: -Tokens.padding.small
anchors.rightMargin: -Tokens.padding.small * 2 anchors.rightMargin: -Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Colours.palette.m3secondaryContainer color: Colours.palette.m3secondaryContainer

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

@ -71,7 +71,7 @@ ColumnLayout {
spacing: Tokens.spacing.normal spacing: Tokens.spacing.normal
implicitWidth: 400 implicitWidth: 400
implicitHeight: content.implicitHeight + Tokens.padding.large * 2 implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
visible: shouldBeVisible || isClosing visible: shouldBeVisible || isClosing
enabled: shouldBeVisible && !isClosing enabled: shouldBeVisible && !isClosing
focus: enabled focus: enabled
@ -128,7 +128,7 @@ ColumnLayout {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 400 Layout.preferredWidth: 400
implicitHeight: content.implicitHeight + Tokens.padding.large * 2 implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
visible: root.shouldBeVisible || root.isClosing visible: root.shouldBeVisible || root.isClosing
@ -252,7 +252,7 @@ ColumnLayout {
font.pointSize: Tokens.font.size.small font.pointSize: Tokens.font.size.small
font.weight: 400 font.weight: 400
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.maximumWidth: parent.width - Tokens.padding.large * 2 Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
} }
FocusScope { FocusScope {

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

@ -88,7 +88,7 @@ ColumnLayout {
readonly property bool isDisabled: layoutIndex > 3 readonly property bool isDisabled: layoutIndex > 3
width: list.width width: list.width
height: Math.max(36, rowText.implicitHeight + Tokens.padding.extraSmall * 2) height: Math.max(36, rowText.implicitHeight + Tokens.padding.small)
ToolTip.visible: isDisabled && layer.containsMouse ToolTip.visible: isDisabled && layer.containsMouse
ToolTip.text: "XKB limitation: maximum 4 layouts allowed" ToolTip.text: "XKB limitation: maximum 4 layouts allowed"

4
modules/controlcenter/NavRail.qml
View file

@ -15,8 +15,8 @@ Item {
required property Session session required property Session session
required property bool initialOpeningComplete required property bool initialOpeningComplete
implicitWidth: layout.implicitWidth + Tokens.padding.medium * 4 implicitWidth: layout.implicitWidth + Tokens.padding.extraExtraLarge
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
ColumnLayout { ColumnLayout {
id: layout id: layout

2
modules/controlcenter/appearance/AppearancePane.qml
View file

@ -120,7 +120,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.bottomMargin: -Tokens.padding.large * 2 Layout.bottomMargin: -Tokens.padding.extraLargeIncreased
asynchronous: true asynchronous: true
active: { active: {

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

@ -70,7 +70,7 @@ StyledFlickable {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: deviceStatus.implicitHeight + Tokens.padding.large * 2 implicitHeight: deviceStatus.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -129,7 +129,7 @@ StyledFlickable {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: deviceProps.implicitHeight + Tokens.padding.large * 2 implicitHeight: deviceProps.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -231,7 +231,7 @@ StyledFlickable {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer color: Colours.palette.m3secondaryContainer
@ -270,7 +270,7 @@ StyledFlickable {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: editIcon.implicitHeight + Tokens.padding.large
radius: root.session.bt.editingDeviceName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) radius: root.session.bt.editingDeviceName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0)
@ -335,7 +335,7 @@ StyledFlickable {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: deviceInfo.implicitHeight + Tokens.padding.large * 2 implicitHeight: deviceInfo.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -479,7 +479,7 @@ StyledFlickable {
when: root.session.bt.fabMenuOpen when: root.session.bt.fabMenuOpen
PropertyChanges { PropertyChanges {
fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + root.Tokens.padding.large * 2 fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + root.Tokens.padding.extraLargeIncreased
fabMenuItem.opacity: 1 fabMenuItem.opacity: 1
fabMenuItemInner.opacity: 1 fabMenuItemInner.opacity: 1
} }

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

@ -211,7 +211,7 @@ DeviceList {
id: connectBtn id: connectBtn
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0) color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0)

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

@ -37,7 +37,7 @@ ColumnLayout {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: adapterStatus.implicitHeight + Tokens.padding.large * 2 implicitHeight: adapterStatus.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -98,7 +98,7 @@ ColumnLayout {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: adapterSettings.implicitHeight + Tokens.padding.large * 2 implicitHeight: adapterSettings.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -128,7 +128,7 @@ ColumnLayout {
property bool expanded property bool expanded
implicitWidth: adapterPicker.implicitWidth + Tokens.padding.medium * 2 implicitWidth: adapterPicker.implicitWidth + Tokens.padding.medium * 2
implicitHeight: adapterPicker.implicitHeight + Tokens.padding.small * 2 implicitHeight: adapterPicker.implicitHeight + Tokens.padding.large
StateLayer { StateLayer {
onClicked: { onClicked: {
@ -368,7 +368,7 @@ ColumnLayout {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
color: Colours.palette.m3secondaryContainer color: Colours.palette.m3secondaryContainer
@ -407,7 +407,7 @@ ColumnLayout {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: editIcon.implicitHeight + Tokens.padding.large
radius: root.session.bt.editingAdapterName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) radius: root.session.bt.editingAdapterName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0) color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0)
@ -455,7 +455,7 @@ ColumnLayout {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: adapterInfo.implicitHeight + Tokens.padding.large * 2 implicitHeight: adapterInfo.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer

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

@ -16,7 +16,7 @@ StyledRect {
property int rows: 1 // Number of rows property int rows: 1 // Number of rows
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
clip: true clip: true

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

@ -87,7 +87,7 @@ RowLayout {
id: rightLoader id: rightLoader
anchors.fill: parent anchors.fill: parent
anchors.margins: Tokens.padding.large * 2 anchors.margins: Tokens.padding.extraLargeIncreased
asynchronous: true asynchronous: true
sourceComponent: root.rightContent sourceComponent: root.rightContent

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

@ -520,9 +520,9 @@ Item {
spacing: Tokens.spacing.normal spacing: Tokens.spacing.normal
SettingsHeader { SettingsHeader {
Layout.leftMargin: Tokens.padding.large * 2 Layout.leftMargin: Tokens.padding.extraLargeIncreased
Layout.rightMargin: Tokens.padding.large * 2 Layout.rightMargin: Tokens.padding.extraLargeIncreased
Layout.topMargin: Tokens.padding.large * 2 Layout.topMargin: Tokens.padding.extraLargeIncreased
visible: displayedApp === null visible: displayedApp === null
icon: "apps" icon: "apps"
title: qsTr("Launcher Applications") title: qsTr("Launcher Applications")
@ -530,9 +530,9 @@ Item {
Item { Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.leftMargin: Tokens.padding.large * 2 Layout.leftMargin: Tokens.padding.extraLargeIncreased
Layout.rightMargin: Tokens.padding.large * 2 Layout.rightMargin: Tokens.padding.extraLargeIncreased
Layout.topMargin: Tokens.padding.large * 2 Layout.topMargin: Tokens.padding.extraLargeIncreased
visible: displayedApp !== null visible: displayedApp !== null
implicitWidth: Math.max(appIconImage.implicitWidth, appTitleText.implicitWidth) implicitWidth: Math.max(appIconImage.implicitWidth, appTitleText.implicitWidth)
implicitHeight: appIconImage.implicitHeight + Tokens.spacing.normal + appTitleText.implicitHeight implicitHeight: appIconImage.implicitHeight + Tokens.spacing.normal + appTitleText.implicitHeight
@ -574,8 +574,8 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.topMargin: Tokens.spacing.large Layout.topMargin: Tokens.spacing.large
Layout.leftMargin: Tokens.padding.large * 2 Layout.leftMargin: Tokens.padding.extraLargeIncreased
Layout.rightMargin: Tokens.padding.large * 2 Layout.rightMargin: Tokens.padding.extraLargeIncreased
StyledFlickable { StyledFlickable {
id: detailsFlickable id: detailsFlickable

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

@ -141,7 +141,7 @@ DeviceList {
id: connectBtn id: connectBtn
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0) color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)

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

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

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

@ -140,8 +140,8 @@ ColumnLayout {
parent: Overlay.overlay parent: Overlay.overlay
anchors.centerIn: parent anchors.centerIn: parent
width: Math.min(600, parent.width - Tokens.padding.large * 2) width: Math.min(600, parent.width - Tokens.padding.extraLargeIncreased)
height: Math.min(700, parent.height - Tokens.padding.large * 2) height: Math.min(700, parent.height - Tokens.padding.extraLargeIncreased)
modal: true modal: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside

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

@ -260,7 +260,7 @@ DeviceDetails {
parent: Overlay.overlay parent: Overlay.overlay
anchors.centerIn: parent anchors.centerIn: parent
width: Math.min(400, parent.width - Tokens.padding.large * 2) width: Math.min(400, parent.width - Tokens.padding.extraLargeIncreased)
padding: Tokens.padding.large * 1.5 padding: Tokens.padding.large * 1.5
modal: true modal: true

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

@ -205,7 +205,7 @@ ColumnLayout {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, VPN.connected && modelData.enabled ? 1 : 0) color: Qt.alpha(Colours.palette.m3primaryContainer, VPN.connected && modelData.enabled ? 1 : 0)
@ -265,7 +265,7 @@ ColumnLayout {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: deleteIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: deleteIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: "transparent" color: "transparent"
@ -363,7 +363,7 @@ ColumnLayout {
parent: Overlay.overlay parent: Overlay.overlay
x: Math.round((parent.width - width) / 2) x: Math.round((parent.width - width) / 2)
y: Math.round((parent.height - height) / 2) y: Math.round((parent.height - height) / 2)
implicitWidth: Math.min(400, parent.width - Tokens.padding.large * 2) implicitWidth: Math.min(400, parent.width - Tokens.padding.extraLargeIncreased)
padding: Tokens.padding.large * 1.5 padding: Tokens.padding.large * 1.5
modal: true modal: true

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

@ -191,7 +191,7 @@ DeviceList {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2 implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0) color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0)

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

@ -99,7 +99,7 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
implicitWidth: 400 implicitWidth: 400
implicitHeight: content.implicitHeight + Tokens.padding.large * 2 implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surface color: Colours.tPalette.m3surface
@ -185,7 +185,7 @@ Item {
font.pointSize: Tokens.font.size.small font.pointSize: Tokens.font.size.small
font.weight: 400 font.weight: 400
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.maximumWidth: parent.width - Tokens.padding.large * 2 Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
} }
Item { Item {

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

@ -289,7 +289,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
@ -325,7 +325,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
@ -359,7 +359,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
@ -393,7 +393,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
@ -427,7 +427,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
@ -463,7 +463,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.large * 2 implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.layer(Colours.palette.m3surfaceContainer, 2) color: Colours.layer(Colours.palette.m3surfaceContainer, 2)

4
modules/dashboard/Media.qml
View file

@ -18,7 +18,7 @@ Item {
required property DrawerVisibilities visibilities required property DrawerVisibilities visibilities
readonly property bool needsKeyboard: lyricMenuOpen readonly property bool needsKeyboard: lyricMenuOpen
readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Tokens.sizes.dashboard.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Tokens.padding.large * 2 readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Tokens.sizes.dashboard.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Tokens.padding.extraLargeIncreased
readonly property real detailsHeightWithoutLyrics: details.implicitHeight - lyricsViewInDetails.implicitHeight readonly property real detailsHeightWithoutLyrics: details.implicitHeight - lyricsViewInDetails.implicitHeight
property bool lyricMenuOpen: false property bool lyricMenuOpen: false
@ -52,7 +52,7 @@ Item {
} }
} }
implicitWidth: cover.implicitWidth + Tokens.sizes.dashboard.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Tokens.padding.large * 2 implicitWidth: cover.implicitWidth + Tokens.sizes.dashboard.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Tokens.padding.extraLargeIncreased
implicitHeight: nonAnimHeight implicitHeight: nonAnimHeight
Behavior on implicitHeight { Behavior on implicitHeight {

2
modules/dashboard/Performance.qml
View file

@ -11,7 +11,7 @@ import qs.services
Item { Item {
id: root id: root
readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.large * 2 readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.extraLargeIncreased
function displayTemp(temp: real): string { function displayTemp(temp: real): string {
return `${Math.ceil(GlobalConfig.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${GlobalConfig.services.useFahrenheitPerformance ? "F" : "C"}`; return `${Math.ceil(GlobalConfig.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${GlobalConfig.services.useFahrenheitPerformance ? "F" : "C"}`;

2
modules/dashboard/WeatherTab.qml
View file

@ -66,7 +66,7 @@ Item {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small
radius: Tokens.rounding.extraLarge * 2 radius: Tokens.rounding.extraLarge * 2
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer

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

@ -46,7 +46,7 @@ CustomMouseArea {
Item { Item {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: prevMonthText.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: prevMonthText.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
id: prevMonthStateLayer id: prevMonthStateLayer
@ -69,8 +69,8 @@ CustomMouseArea {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.extraSmall * 2 implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.small
implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
onClicked: { onClicked: {
@ -103,7 +103,7 @@ CustomMouseArea {
Item { Item {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: nextMonthText.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: nextMonthText.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
id: nextMonthStateLayer id: nextMonthStateLayer
@ -164,7 +164,7 @@ CustomMouseArea {
required property var model required property var model
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: text.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: text.implicitHeight + Tokens.padding.small
StyledText { StyledText {
id: text id: text

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

@ -127,7 +127,7 @@ Item {
color: Colours.palette.m3primary color: Colours.palette.m3primary
font.pointSize: Tokens.font.size.normal font.pointSize: Tokens.font.size.normal
width: parent.implicitWidth - Tokens.padding.large * 2 width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -144,7 +144,7 @@ Item {
color: Colours.palette.m3outline color: Colours.palette.m3outline
font.pointSize: Tokens.font.size.small font.pointSize: Tokens.font.size.small
width: parent.implicitWidth - Tokens.padding.large * 2 width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -160,7 +160,7 @@ Item {
text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist") text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist")
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
width: parent.implicitWidth - Tokens.padding.large * 2 width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -201,7 +201,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: Tokens.spacing.small anchors.topMargin: Tokens.spacing.small
anchors.bottomMargin: Tokens.padding.large anchors.bottomMargin: Tokens.padding.large
anchors.margins: Tokens.padding.large * 2 anchors.margins: Tokens.padding.extraLargeIncreased
playing: Players.active?.isPlaying ?? false playing: Players.active?.isPlaying ?? false
speed: Audio.beatTracker.bpm / Config.general.mediaGifSpeedAdjustment // qmllint disable unresolved-type speed: Audio.beatTracker.bpm / Config.general.mediaGifSpeedAdjustment // qmllint disable unresolved-type

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

@ -50,7 +50,7 @@ Item {
text: Weather.description text: Weather.description
elide: Text.ElideRight elide: Text.ElideRight
width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Tokens.padding.large * 2) width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Tokens.padding.extraLargeIncreased)
} }
} }
} }

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

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

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

@ -70,7 +70,7 @@ Item {
clip: true clip: true
implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.medium * 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 implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.small
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter

8
modules/lock/Center.qml
View file

@ -73,7 +73,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: -Tokens.padding.large * 2 Layout.topMargin: -Tokens.padding.extraLargeIncreased
text: Time.format("dddd, d MMMM yyyy") text: Time.format("dddd, d MMMM yyyy")
color: Colours.palette.m3tertiary color: Colours.palette.m3tertiary
@ -113,7 +113,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
implicitWidth: root.centerWidth * 0.8 implicitWidth: root.centerWidth * 0.8
implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: input.implicitHeight + Tokens.padding.small
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
radius: Tokens.rounding.full radius: Tokens.rounding.full
@ -152,7 +152,7 @@ ColumnLayout {
Item { Item {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: fprintIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: fprintIcon.implicitHeight + Tokens.padding.small
MaterialIcon { MaterialIcon {
id: fprintIcon id: fprintIcon
@ -188,7 +188,7 @@ ColumnLayout {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: enterIcon.implicitHeight + Tokens.padding.small
color: root.lock.pam.buffer ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) color: root.lock.pam.buffer ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
radius: Tokens.rounding.full radius: Tokens.rounding.full

2
modules/lock/Fetch.qml
View file

@ -13,7 +13,7 @@ ColumnLayout {
id: root id: root
anchors.fill: parent anchors.fill: parent
anchors.margins: Tokens.padding.large * 2 anchors.margins: Tokens.padding.extraLargeIncreased
anchors.topMargin: Tokens.padding.large anchors.topMargin: Tokens.padding.large
spacing: Tokens.spacing.small spacing: Tokens.spacing.small

4
modules/lock/LockSurface.qml
View file

@ -216,8 +216,8 @@ WlSessionLockSurface {
id: content id: content
anchors.centerIn: parent anchors.centerIn: parent
width: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio - Tokens.padding.large * 2 width: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio - Tokens.padding.extraLargeIncreased
height: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult - Tokens.padding.large * 2 height: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult - Tokens.padding.extraLargeIncreased
lock: root lock: root
opacity: 0 opacity: 0

4
modules/lock/Media.qml
View file

@ -150,8 +150,8 @@ Item {
signal clicked signal clicked
Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.medium * 2 : active ? Tokens.padding.extraSmall * 2 : 0) Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.medium * 2 : active ? Tokens.padding.small : 0)
implicitWidth: controlIcon.implicitWidth + Tokens.padding.large * 2 implicitWidth: controlIcon.implicitWidth + Tokens.padding.extraLargeIncreased
implicitHeight: controlIcon.implicitHeight + Tokens.padding.medium * 2 implicitHeight: controlIcon.implicitHeight + Tokens.padding.medium * 2
color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`] color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`]

2
modules/lock/NotifGroup.qml
View file

@ -166,7 +166,7 @@ StyledRect {
} }
StyledRect { StyledRect {
implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2 implicitWidth: expandBtn.implicitWidth + Tokens.padding.large
implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
color: root.urgency === "critical" ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) color: root.urgency === "critical" ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)

2
modules/lock/Resources.qml
View file

@ -68,7 +68,7 @@ GridLayout {
anchors.fill: parent anchors.fill: parent
value: res.value value: res.value
padding: Tokens.padding.large * 3 padding: Tokens.padding.extraExtraLarge
fgColour: res.colour fgColour: res.colour
bgColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 3) bgColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 3)
strokeWidth: width < 200 ? Tokens.padding.small : Tokens.padding.medium strokeWidth: width < 200 ? Tokens.padding.small : Tokens.padding.medium

6
modules/lock/WeatherInfo.qml
View file

@ -13,13 +13,13 @@ ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: Tokens.padding.large * 2 anchors.margins: Tokens.padding.extraLargeIncreased
spacing: Tokens.spacing.small spacing: Tokens.spacing.small
Loader { Loader {
asynchronous: true asynchronous: true
Layout.topMargin: Tokens.padding.large * 2 Layout.topMargin: Tokens.padding.extraLargeIncreased
Layout.bottomMargin: -Tokens.padding.large Layout.bottomMargin: -Tokens.padding.large
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -110,7 +110,7 @@ ColumnLayout {
asynchronous: true asynchronous: true
Layout.topMargin: Tokens.spacing.smaller Layout.topMargin: Tokens.spacing.smaller
Layout.bottomMargin: Tokens.padding.large * 2 Layout.bottomMargin: Tokens.padding.extraLargeIncreased
Layout.fillWidth: true Layout.fillWidth: true
active: root.rootHeight > 820 active: root.rootHeight > 820

4
modules/notifications/Notification.qml
View file

@ -479,9 +479,9 @@ StyledRect {
color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
Layout.preferredWidth: actionText.width + Tokens.padding.medium * 2 Layout.preferredWidth: actionText.width + Tokens.padding.medium * 2
Layout.preferredHeight: actionText.height + Tokens.padding.extraSmall * 2 Layout.preferredHeight: actionText.height + Tokens.padding.small
implicitWidth: actionText.width + Tokens.padding.medium * 2 implicitWidth: actionText.width + Tokens.padding.medium * 2
implicitHeight: actionText.height + Tokens.padding.extraSmall * 2 implicitHeight: actionText.height + Tokens.padding.small
StateLayer { StateLayer {
radius: Tokens.rounding.full radius: Tokens.rounding.full

4
modules/osd/Content.qml
View file

@ -20,8 +20,8 @@ Item {
required property bool sourceMuted required property bool sourceMuted
required property real brightness required property real brightness
implicitWidth: layout.implicitWidth + Tokens.padding.large * 2 implicitWidth: layout.implicitWidth + Tokens.padding.extraLargeIncreased
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
ColumnLayout { ColumnLayout {
id: layout id: layout

2
modules/sidebar/NotifActionList.qml
View file

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

4
modules/sidebar/NotifGroup.qml
View file

@ -186,7 +186,7 @@ StyledRect {
} }
StyledRect { StyledRect {
implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2 implicitWidth: expandBtn.implicitWidth + Tokens.padding.large
implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHigh, 3) color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHigh, 3)
@ -218,7 +218,7 @@ StyledRect {
text: "expand_more" text: "expand_more"
color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface
rotation: root.expanded ? 180 : 0 rotation: root.expanded ? 180 : 0
Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.small / 2) : 0 Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.extraSmall) : 0
Behavior on rotation { Behavior on rotation {
Anim { Anim {

2
modules/sidebar/Wrapper.qml
View file

@ -36,7 +36,7 @@ Item {
active: root.shouldBeActive || root.visible active: root.shouldBeActive || root.visible
sourceComponent: Content { sourceComponent: Content {
implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.large * 2 implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.extraLargeIncreased
props: root.props props: root.props
visibilities: root.visibilities visibilities: root.visibilities
} }

6
modules/utilities/RecordingDeleteModal.qml
View file

@ -144,9 +144,9 @@ Loader {
scale: 0 scale: 0
Component.onCompleted: scale = Qt.binding(() => root.props.recordingConfirmDelete ? 1 : 0) Component.onCompleted: scale = Qt.binding(() => root.props.recordingConfirmDelete ? 1 : 0)
width: Math.min(parent.width - Tokens.padding.large * 2, implicitWidth) width: Math.min(parent.width - Tokens.padding.extraLargeIncreased, implicitWidth)
implicitWidth: deleteConfirmationLayout.implicitWidth + Tokens.padding.large * 3 implicitWidth: deleteConfirmationLayout.implicitWidth + Tokens.padding.extraExtraLarge
implicitHeight: deleteConfirmationLayout.implicitHeight + Tokens.padding.large * 3 implicitHeight: deleteConfirmationLayout.implicitHeight + Tokens.padding.extraExtraLarge
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent

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

@ -9,7 +9,7 @@ StyledRect {
id: root id: root
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.large * 2 implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer
@ -26,7 +26,7 @@ StyledRect {
StyledRect { StyledRect {
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 implicitHeight: icon.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: IdleInhibitor.enabled ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer color: IdleInhibitor.enabled ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@ -84,7 +84,7 @@ StyledRect {
sourceComponent: StyledRect { sourceComponent: StyledRect {
implicitWidth: activeText.implicitWidth + Tokens.padding.medium * 2 implicitWidth: activeText.implicitWidth + Tokens.padding.medium * 2
implicitHeight: activeText.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: activeText.implicitHeight + Tokens.padding.small
radius: Tokens.rounding.full radius: Tokens.rounding.full
color: Colours.palette.m3primary color: Colours.palette.m3primary

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

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

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

@ -38,7 +38,7 @@ StyledRect {
readonly property bool needExtraRow: quickToggles.length > 6 readonly property bool needExtraRow: quickToggles.length > 6
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: layout.implicitHeight + Tokens.padding.large * 2 implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: Colours.tPalette.m3surfaceContainer color: Colours.tPalette.m3surfaceContainer

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

@ -13,7 +13,7 @@ StyledRect {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
implicitHeight: layout.implicitHeight + Tokens.padding.small * 2 implicitHeight: layout.implicitHeight + Tokens.padding.large
radius: Tokens.rounding.large radius: Tokens.rounding.large
color: { color: {
@ -68,7 +68,7 @@ StyledRect {
} }
implicitWidth: implicitHeight implicitWidth: implicitHeight
implicitHeight: icon.implicitHeight + Tokens.padding.small * 2 implicitHeight: icon.implicitHeight + Tokens.padding.large
MaterialIcon { MaterialIcon {
id: icon id: icon

8
modules/windowinfo/Buttons.qml
View file

@ -33,7 +33,7 @@ ColumnLayout {
color: Colours.palette.m3primary color: Colours.palette.m3primary
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.extraSmall * 2 implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.small
implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.extraSmall implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.extraSmall
StateLayer { StateLayer {
@ -56,8 +56,8 @@ ColumnLayout {
WrapperItem { WrapperItem {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: Tokens.padding.large * 2 Layout.leftMargin: Tokens.padding.extraLargeIncreased
Layout.rightMargin: Tokens.padding.large * 2 Layout.rightMargin: Tokens.padding.extraLargeIncreased
Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0 Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0
clip: true clip: true
@ -145,7 +145,7 @@ ColumnLayout {
radius: Tokens.rounding.medium radius: Tokens.rounding.medium
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: label.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: label.implicitHeight + Tokens.padding.small
StateLayer { StateLayer {
id: stateLayer id: stateLayer

6
modules/windowinfo/Details.qml
View file

@ -14,7 +14,7 @@ ColumnLayout {
spacing: Tokens.spacing.small spacing: Tokens.spacing.small
Label { Label {
Layout.topMargin: Tokens.padding.large * 2 Layout.topMargin: Tokens.padding.extraLargeIncreased
text: root.client?.title ?? qsTr("No active client") text: root.client?.title ?? qsTr("No active client")
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@ -33,8 +33,8 @@ ColumnLayout {
StyledRect { StyledRect {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 Layout.preferredHeight: 1
Layout.leftMargin: Tokens.padding.large * 2 Layout.leftMargin: Tokens.padding.extraLargeIncreased
Layout.rightMargin: Tokens.padding.large * 2 Layout.rightMargin: Tokens.padding.extraLargeIncreased
Layout.topMargin: Tokens.spacing.normal Layout.topMargin: Tokens.spacing.normal
Layout.bottomMargin: Tokens.spacing.large Layout.bottomMargin: Tokens.spacing.large

2
modules/windowinfo/Preview.qml
View file

@ -15,7 +15,7 @@ Item {
required property ShellScreen screen required property ShellScreen screen
required property HyprlandToplevel client required property HyprlandToplevel client
Layout.preferredWidth: preview.implicitWidth + Tokens.padding.large * 2 Layout.preferredWidth: preview.implicitWidth + Tokens.padding.extraLargeIncreased
Layout.fillHeight: true Layout.fillHeight: true
StyledClippingRect { StyledClippingRect {