From b5dcd07ab8e8c4b1238feb4c49792fe9a2c927ef Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:24:16 +1000 Subject: [PATCH] fix: use correct size tokens in QML --- modules/background/Background.qml | 2 +- modules/bar/BarWrapper.qml | 2 +- modules/bar/components/Clock.qml | 2 +- modules/bar/components/StatusIcons.qml | 2 +- modules/bar/components/Tray.qml | 2 +- .../components/workspaces/ActiveIndicator.qml | 2 +- .../bar/components/workspaces/OccupiedBg.qml | 2 +- .../workspaces/SpecialWorkspaces.qml | 2 +- .../bar/components/workspaces/Workspace.qml | 4 ++-- .../bar/components/workspaces/Workspaces.qml | 2 +- modules/bar/popouts/ActiveWindow.qml | 4 ++-- modules/bar/popouts/Battery.qml | 2 +- modules/bar/popouts/Network.qml | 2 +- modules/bar/popouts/TrayMenu.qml | 4 ++-- modules/bar/popouts/kblayout/KbLayout.qml | 2 +- modules/controlcenter/ControlCenter.qml | 4 ++-- modules/controlcenter/launcher/Settings.qml | 8 +++---- modules/dashboard/Dash.qml | 2 +- modules/dashboard/Media.qml | 14 +++++------ modules/dashboard/Tabs.qml | 2 +- modules/dashboard/dash/DateTime.qml | 2 +- modules/dashboard/dash/Media.qml | 24 +++++++++---------- modules/dashboard/dash/Resources.qml | 2 +- modules/dashboard/dash/User.qml | 8 +++---- modules/launcher/AppList.qml | 2 +- modules/launcher/ContentList.qml | 6 ++--- modules/launcher/WallpaperList.qml | 2 +- modules/launcher/items/ActionItem.qml | 2 +- modules/launcher/items/AppItem.qml | 2 +- modules/launcher/items/CalcItem.qml | 2 +- modules/launcher/items/SchemeItem.qml | 2 +- modules/launcher/items/VariantItem.qml | 2 +- modules/launcher/items/WallpaperItem.qml | 2 +- modules/lock/Center.qml | 2 +- modules/lock/LockSurface.qml | 8 +++---- modules/lock/NotifGroup.qml | 20 ++++++++-------- modules/notifications/Content.qml | 4 ++-- modules/notifications/Notification.qml | 22 ++++++++--------- modules/osd/Content.qml | 14 +++++------ modules/session/Content.qml | 8 +++---- modules/sidebar/NotifGroup.qml | 22 ++++++++--------- modules/sidebar/Wrapper.qml | 4 ++-- modules/utilities/Wrapper.qml | 2 +- modules/utilities/toasts/Toasts.qml | 2 +- modules/windowinfo/WindowInfo.qml | 4 ++-- services/NotifData.qml | 6 ++--- 46 files changed, 121 insertions(+), 121 deletions(-) diff --git a/modules/background/Background.qml b/modules/background/Background.qml index 14669eab..1fe3be74 100644 --- a/modules/background/Background.qml +++ b/modules/background/Background.qml @@ -57,7 +57,7 @@ Variants { active: Config.background.desktopClock.enabled anchors.margins: Tokens.padding.large * 2 - anchors.leftMargin: Tokens.padding.large * 2 + Config.bar.sizes.innerWidth + Math.max(Tokens.padding.smaller, Config.border.thickness) + anchors.leftMargin: Tokens.padding.large * 2 + Tokens.sizes.bar.innerWidth + Math.max(Tokens.padding.smaller, Config.border.thickness) state: Config.background.desktopClock.position states: [ diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml index 8ea61505..52050e05 100644 --- a/modules/bar/BarWrapper.qml +++ b/modules/bar/BarWrapper.qml @@ -19,7 +19,7 @@ Item { 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 contentWidth: Config.bar.sizes.innerWidth + padding * 2 + 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) property bool isHovered diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index ead13d9e..693659c5 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -11,7 +11,7 @@ StyledRect { readonly property color colour: Colours.palette.m3tertiary readonly property int padding: Config.bar.clock.background ? Tokens.padding.normal : Tokens.padding.small - implicitWidth: Config.bar.sizes.innerWidth + implicitWidth: Tokens.sizes.bar.innerWidth implicitHeight: layout.implicitHeight + root.padding * 2 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, Config.bar.clock.background ? Colours.tPalette.m3surfaceContainer.a : 0) diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index c32bc21f..c2a4b047 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/modules/bar/components/StatusIcons.qml @@ -20,7 +20,7 @@ StyledRect { radius: Tokens.rounding.full clip: true - implicitWidth: Config.bar.sizes.innerWidth + implicitWidth: Tokens.sizes.bar.innerWidth implicitHeight: iconColumn.implicitHeight + Tokens.padding.normal * 2 - (Config.bar.status.showLockStatus && !Hypr.capsLock && !Hypr.numLock ? iconColumn.spacing : 0) ColumnLayout { diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index 76785813..98650fae 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -28,7 +28,7 @@ StyledRect { clip: true visible: height > 0 - implicitWidth: Config.bar.sizes.innerWidth + implicitWidth: Tokens.sizes.bar.innerWidth implicitHeight: nonAnimHeight color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (Config.bar.tray.background && items.count > 0) ? Colours.tPalette.m3surfaceContainer.a : 0) diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index 0c785901..c76f9457 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -42,7 +42,7 @@ StyledRect { clip: true y: offset + mask.y - implicitWidth: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 + implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2 implicitHeight: size radius: Tokens.rounding.full color: Colours.palette.m3primary diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml index 891b1250..da7e70c6 100644 --- a/modules/bar/components/workspaces/OccupiedBg.qml +++ b/modules/bar/components/workspaces/OccupiedBg.qml @@ -65,7 +65,7 @@ Item { anchors.horizontalCenter: root.horizontalCenter y: (start?.y ?? 0) - 1 - implicitWidth: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 + 2 + implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2 + 2 implicitHeight: start && end ? end.y + end.size - start.y + 2 : 0 color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml index 741d4340..70eb22a0 100644 --- a/modules/bar/components/workspaces/SpecialWorkspaces.qml +++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml @@ -284,7 +284,7 @@ Item { asynchronous: true Layout.alignment: Qt.AlignHCenter | Qt.AlignTop - Layout.preferredHeight: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 + Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2 sourceComponent: ws.icon.length === 1 ? letterComp : iconComp diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml index af037051..62d09d4b 100644 --- a/modules/bar/components/workspaces/Workspace.qml +++ b/modules/bar/components/workspaces/Workspace.qml @@ -33,7 +33,7 @@ ColumnLayout { id: indicator Layout.alignment: Qt.AlignHCenter | Qt.AlignTop - Layout.preferredHeight: Config.bar.sizes.innerWidth - Tokens.padding.small * 2 + Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small * 2 animate: true text: { @@ -61,7 +61,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter Layout.fillHeight: true - Layout.topMargin: -Config.bar.sizes.innerWidth / 10 + Layout.topMargin: -Tokens.sizes.bar.innerWidth / 10 visible: active active: root.hasWindows diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml index a0ccb775..ae43f974 100644 --- a/modules/bar/components/workspaces/Workspaces.qml +++ b/modules/bar/components/workspaces/Workspaces.qml @@ -27,7 +27,7 @@ StyledClippingRect { property real blur: onSpecial ? 1 : 0 - implicitWidth: Config.bar.sizes.innerWidth + implicitWidth: Tokens.sizes.bar.innerWidth implicitHeight: layout.implicitHeight + Tokens.padding.small * 2 color: Colours.tPalette.m3surfaceContainer diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml index a37d81f9..e0ef85d9 100644 --- a/modules/bar/popouts/ActiveWindow.qml +++ b/modules/bar/popouts/ActiveWindow.qml @@ -95,8 +95,8 @@ Item { captureSource: Hypr.activeToplevel?.wayland ?? null // qmllint disable unresolved-type live: visible - constraintSize.width: Config.bar.sizes.windowPreviewSize - constraintSize.height: Config.bar.sizes.windowPreviewSize + constraintSize.width: Tokens.sizes.bar.windowPreviewSize + constraintSize.height: Tokens.sizes.bar.windowPreviewSize } } } diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index 2a11071e..149e21c2 100644 --- a/modules/bar/popouts/Battery.qml +++ b/modules/bar/popouts/Battery.qml @@ -10,7 +10,7 @@ Column { id: root spacing: Tokens.spacing.normal - width: Config.bar.sizes.batteryWidth + width: Tokens.sizes.bar.batteryWidth StyledText { text: UPower.displayDevice.isLaptopBattery ? qsTr("Remaining: %1%").arg(Math.round(UPower.displayDevice.percentage * 100)) : qsTr("No battery detected") diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml index 6bcf6604..cec936d9 100644 --- a/modules/bar/popouts/Network.qml +++ b/modules/bar/popouts/Network.qml @@ -20,7 +20,7 @@ ColumnLayout { property bool showPasswordDialog: false spacing: Tokens.spacing.small - width: Config.bar.sizes.networkWidth + width: Tokens.sizes.bar.networkWidth // Wireless section StyledText { diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml index f39d64b0..9576049b 100644 --- a/modules/bar/popouts/TrayMenu.qml +++ b/modules/bar/popouts/TrayMenu.qml @@ -78,7 +78,7 @@ StackView { required property QsMenuEntry modelData - implicitWidth: Config.bar.sizes.trayMenuWidth + implicitWidth: Tokens.sizes.bar.trayMenuWidth implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight radius: Tokens.rounding.full @@ -152,7 +152,7 @@ StackView { font.family: label.font.family elide: Text.ElideRight - elideWidth: Config.bar.sizes.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + Tokens.spacing.normal : 0) + elideWidth: Tokens.sizes.bar.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + Tokens.spacing.normal : 0) } Loader { diff --git a/modules/bar/popouts/kblayout/KbLayout.qml b/modules/bar/popouts/kblayout/KbLayout.qml index 5767de46..265d3ab8 100644 --- a/modules/bar/popouts/kblayout/KbLayout.qml +++ b/modules/bar/popouts/kblayout/KbLayout.qml @@ -15,7 +15,7 @@ ColumnLayout { } spacing: Tokens.spacing.small - width: Config.bar.sizes.kbLayoutWidth + width: Tokens.sizes.bar.kbLayoutWidth Component.onCompleted: kb.start() diff --git a/modules/controlcenter/ControlCenter.qml b/modules/controlcenter/ControlCenter.qml index 9b1f01ea..b2c07e52 100644 --- a/modules/controlcenter/ControlCenter.qml +++ b/modules/controlcenter/ControlCenter.qml @@ -27,8 +27,8 @@ Item { signal close - implicitWidth: implicitHeight * Config.controlCenter.sizes.ratio - implicitHeight: screen.height * Config.controlCenter.sizes.heightMult + implicitWidth: implicitHeight * Tokens.sizes.controlCenter.ratio + implicitHeight: screen.height * Tokens.sizes.controlCenter.heightMult GridLayout { anchors.fill: parent diff --git a/modules/controlcenter/launcher/Settings.qml b/modules/controlcenter/launcher/Settings.qml index 1641570c..ec29aeb2 100644 --- a/modules/controlcenter/launcher/Settings.qml +++ b/modules/controlcenter/launcher/Settings.qml @@ -178,25 +178,25 @@ ColumnLayout { PropertyRow { label: qsTr("Item width") - value: qsTr("%1 px").arg(Config.launcher.sizes.itemWidth) + value: qsTr("%1 px").arg(Tokens.sizes.launcher.itemWidth) } PropertyRow { showTopMargin: true label: qsTr("Item height") - value: qsTr("%1 px").arg(Config.launcher.sizes.itemHeight) + value: qsTr("%1 px").arg(Tokens.sizes.launcher.itemHeight) } PropertyRow { showTopMargin: true label: qsTr("Wallpaper width") - value: qsTr("%1 px").arg(Config.launcher.sizes.wallpaperWidth) + value: qsTr("%1 px").arg(Tokens.sizes.launcher.wallpaperWidth) } PropertyRow { showTopMargin: true label: qsTr("Wallpaper height") - value: qsTr("%1 px").arg(Config.launcher.sizes.wallpaperHeight) + value: qsTr("%1 px").arg(Tokens.sizes.launcher.wallpaperHeight) } } diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml index 3de9fb6b..cc6c5171 100644 --- a/modules/dashboard/Dash.qml +++ b/modules/dashboard/Dash.qml @@ -34,7 +34,7 @@ GridLayout { Rect { Layout.row: 0 Layout.columnSpan: 2 - Layout.preferredWidth: Config.dashboard.sizes.weatherWidth + Layout.preferredWidth: Tokens.sizes.dashboard.weatherWidth Layout.fillHeight: true radius: Tokens.rounding.large * 1.5 diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index d8ed44b3..43a2311e 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -18,7 +18,7 @@ Item { required property DrawerVisibilities visibilities readonly property bool needsKeyboard: lyricMenuOpen - readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Config.dashboard.sizes.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.large * 2 readonly property real detailsHeightWithoutLyrics: details.implicitHeight - lyricsViewInDetails.implicitHeight property bool lyricMenuOpen: false @@ -52,7 +52,7 @@ Item { } } - implicitWidth: cover.implicitWidth + Config.dashboard.sizes.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.large * 2 implicitHeight: nonAnimHeight Behavior on implicitHeight { @@ -111,7 +111,7 @@ Item { property color colour: Colours.palette.m3primary anchors.fill: cover - anchors.margins: -Config.dashboard.sizes.mediaVisualiserSize + anchors.margins: -Tokens.sizes.dashboard.mediaVisualiserSize asynchronous: true preferredRendererType: Shape.CurveRenderer @@ -132,7 +132,7 @@ Item { readonly property real value: Math.max(1e-3, Math.min(1, Audio.cava.values[modelData])) readonly property real angle: modelData * 2 * Math.PI / Config.services.visualiserBars - readonly property real magnitude: value * Config.dashboard.sizes.mediaVisualiserSize + readonly property real magnitude: value * Tokens.sizes.dashboard.mediaVisualiserSize readonly property real cos: Math.cos(angle) readonly property real sin: Math.sin(angle) @@ -159,10 +159,10 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: Tokens.padding.large + Config.dashboard.sizes.mediaVisualiserSize + anchors.leftMargin: Tokens.padding.large + Tokens.sizes.dashboard.mediaVisualiserSize - implicitWidth: Config.dashboard.sizes.mediaCoverArtSize - implicitHeight: Config.dashboard.sizes.mediaCoverArtSize + implicitWidth: Tokens.sizes.dashboard.mediaCoverArtSize + implicitHeight: Tokens.sizes.dashboard.mediaCoverArtSize color: Colours.tPalette.m3surfaceContainerHigh radius: Infinity diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index 94556aca..04728d2e 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -182,7 +182,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - implicitHeight: parent.height + Config.dashboard.sizes.tabIndicatorSpacing * 2 + implicitHeight: parent.height + Tokens.sizes.dashboard.tabIndicatorSpacing * 2 color: "transparent" radius: Tokens.rounding.small diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml index 1b43b137..2df22d15 100644 --- a/modules/dashboard/dash/DateTime.qml +++ b/modules/dashboard/dash/DateTime.qml @@ -11,7 +11,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom - implicitWidth: Config.dashboard.sizes.dateTimeWidth + implicitWidth: Tokens.sizes.dashboard.dateTimeWidth ColumnLayout { anchors.left: parent.left diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index d6cfa76a..07d2352e 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -16,7 +16,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom - implicitWidth: Config.dashboard.sizes.mediaWidth + implicitWidth: Tokens.sizes.dashboard.mediaWidth Behavior on playerProgress { Anim { @@ -42,16 +42,16 @@ Item { ShapePath { fillColor: "transparent" strokeColor: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) - strokeWidth: Config.dashboard.sizes.mediaProgressThickness + strokeWidth: Tokens.sizes.dashboard.mediaProgressThickness capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { centerX: cover.x + cover.width / 2 centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small - startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 - sweepAngle: Config.dashboard.sizes.mediaProgressSweep + radiusX: (cover.width + Tokens.sizes.dashboard.mediaProgressThickness) / 2 + Tokens.spacing.small + radiusY: (cover.height + Tokens.sizes.dashboard.mediaProgressThickness) / 2 + Tokens.spacing.small + startAngle: -90 - Tokens.sizes.dashboard.mediaProgressSweep / 2 + sweepAngle: Tokens.sizes.dashboard.mediaProgressSweep } Behavior on strokeColor { @@ -62,16 +62,16 @@ Item { ShapePath { fillColor: "transparent" strokeColor: Colours.palette.m3primary - strokeWidth: Config.dashboard.sizes.mediaProgressThickness + strokeWidth: Tokens.sizes.dashboard.mediaProgressThickness capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap PathAngleArc { centerX: cover.x + cover.width / 2 centerY: cover.y + cover.height / 2 - radiusX: (cover.width + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small - radiusY: (cover.height + Config.dashboard.sizes.mediaProgressThickness) / 2 + Tokens.spacing.small - startAngle: -90 - Config.dashboard.sizes.mediaProgressSweep / 2 - sweepAngle: Config.dashboard.sizes.mediaProgressSweep * root.playerProgress + radiusX: (cover.width + Tokens.sizes.dashboard.mediaProgressThickness) / 2 + Tokens.spacing.small + radiusY: (cover.height + Tokens.sizes.dashboard.mediaProgressThickness) / 2 + Tokens.spacing.small + startAngle: -90 - Tokens.sizes.dashboard.mediaProgressSweep / 2 + sweepAngle: Tokens.sizes.dashboard.mediaProgressSweep * root.playerProgress } Behavior on strokeColor { @@ -86,7 +86,7 @@ Item { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - anchors.margins: Tokens.padding.large + Config.dashboard.sizes.mediaProgressThickness + Tokens.spacing.small + anchors.margins: Tokens.padding.large + Tokens.sizes.dashboard.mediaProgressThickness + Tokens.spacing.small implicitHeight: width color: Colours.tPalette.m3surfaceContainerHigh diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index 3dec14f2..f492cc58 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -53,7 +53,7 @@ Row { anchors.bottom: icon.top anchors.bottomMargin: Tokens.spacing.small - implicitWidth: Config.dashboard.sizes.resourceProgessThickness + implicitWidth: Tokens.sizes.dashboard.resourceProgessThickness color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) radius: Tokens.rounding.full diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 03ca0e6b..3b13bc7c 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -120,7 +120,7 @@ Row { id: icon anchors.left: parent.left - anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2 + anchors.leftMargin: (Tokens.sizes.dashboard.infoIconSize - implicitWidth) / 2 source: SysInfo.osLogo implicitSize: Math.floor(Tokens.font.size.normal * 1.34) @@ -136,7 +136,7 @@ Row { text: `: ${SysInfo.osPrettyName || SysInfo.osName}` font.pointSize: Tokens.font.size.normal - width: Config.dashboard.sizes.infoWidth + width: Tokens.sizes.dashboard.infoWidth elide: Text.ElideRight } } @@ -170,7 +170,7 @@ Row { id: icon anchors.left: parent.left - anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2 + anchors.leftMargin: (Tokens.sizes.dashboard.infoIconSize - implicitWidth) / 2 fill: 1 text: line.icon @@ -187,7 +187,7 @@ Row { text: `: ${line.text}` font.pointSize: Tokens.font.size.normal - width: Config.dashboard.sizes.infoWidth + width: Tokens.sizes.dashboard.infoWidth elide: Text.ElideRight } } diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml index 7ce6038d..bdad31e0 100644 --- a/modules/launcher/AppList.qml +++ b/modules/launcher/AppList.qml @@ -24,7 +24,7 @@ StyledListView { spacing: Tokens.spacing.small orientation: Qt.Vertical - implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxShown, count) - spacing + implicitHeight: (Tokens.sizes.launcher.itemHeight + spacing) * Math.min(Config.launcher.maxShown, count) - spacing preferredHighlightBegin: 0 preferredHighlightEnd: height diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index d36cfad9..e59dd382 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -32,7 +32,7 @@ Item { name: "apps" PropertyChanges { - root.implicitWidth: Config.launcher.sizes.itemWidth + root.implicitWidth: Tokens.sizes.launcher.itemWidth root.implicitHeight: Math.min(root.maxHeight, appList.implicitHeight > 0 ? appList.implicitHeight : empty.implicitHeight) appList.active: true } @@ -46,8 +46,8 @@ Item { name: "wallpapers" PropertyChanges { - root.implicitWidth: Math.max(Config.launcher.sizes.itemWidth * 1.2, wallpaperList.implicitWidth) - root.implicitHeight: Config.launcher.sizes.wallpaperHeight + root.implicitWidth: Math.max(Tokens.sizes.launcher.itemWidth * 1.2, wallpaperList.implicitWidth) + root.implicitHeight: Tokens.sizes.launcher.wallpaperHeight wallpaperList.active: true } } diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml index dc2dd003..705563a8 100644 --- a/modules/launcher/WallpaperList.qml +++ b/modules/launcher/WallpaperList.qml @@ -15,7 +15,7 @@ PathView { required property var panels required property var content - readonly property int itemWidth: Config.launcher.sizes.wallpaperWidth * 0.8 + Tokens.padding.larger * 2 + readonly property int itemWidth: Tokens.sizes.launcher.wallpaperWidth * 0.8 + Tokens.padding.larger * 2 readonly property int numItems: { const screen = (QsWindow.window as QsWindow)?.screen; diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml index c0fb4ac2..06d3e0c9 100644 --- a/modules/launcher/items/ActionItem.qml +++ b/modules/launcher/items/ActionItem.qml @@ -9,7 +9,7 @@ Item { required property var modelData required property var list - implicitHeight: Config.launcher.sizes.itemHeight + implicitHeight: Tokens.sizes.launcher.itemHeight anchors.left: parent?.left anchors.right: parent?.right diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml index e021275c..f65a6b65 100644 --- a/modules/launcher/items/AppItem.qml +++ b/modules/launcher/items/AppItem.qml @@ -13,7 +13,7 @@ Item { required property DesktopEntry modelData required property DrawerVisibilities visibilities - implicitHeight: Config.launcher.sizes.itemHeight + implicitHeight: Tokens.sizes.launcher.itemHeight anchors.left: parent?.left anchors.right: parent?.right diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index a016f585..d18cbf90 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -22,7 +22,7 @@ Item { Qalculator.evalAsync(math); } - implicitHeight: Config.launcher.sizes.itemHeight + implicitHeight: Tokens.sizes.launcher.itemHeight anchors.left: parent?.left anchors.right: parent?.right diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml index 2fbfabaa..c5d9d8bb 100644 --- a/modules/launcher/items/SchemeItem.qml +++ b/modules/launcher/items/SchemeItem.qml @@ -10,7 +10,7 @@ Item { required property Schemes.Scheme modelData required property var list - implicitHeight: Config.launcher.sizes.itemHeight + implicitHeight: Tokens.sizes.launcher.itemHeight anchors.left: parent?.left anchors.right: parent?.right diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml index 73f66994..eb486ea1 100644 --- a/modules/launcher/items/VariantItem.qml +++ b/modules/launcher/items/VariantItem.qml @@ -10,7 +10,7 @@ Item { required property M3Variants.Variant modelData required property var list - implicitHeight: Config.launcher.sizes.itemHeight + implicitHeight: Tokens.sizes.launcher.itemHeight anchors.left: parent?.left anchors.right: parent?.right diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml index 7ffa75f7..cd41a315 100644 --- a/modules/launcher/items/WallpaperItem.qml +++ b/modules/launcher/items/WallpaperItem.qml @@ -52,7 +52,7 @@ Item { color: Colours.tPalette.m3surfaceContainer radius: Tokens.rounding.normal - implicitWidth: Config.launcher.sizes.wallpaperWidth + implicitWidth: Tokens.sizes.launcher.wallpaperWidth implicitHeight: implicitWidth / 16 * 9 MaterialIcon { diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index 95cd6018..aa4bd51b 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -14,7 +14,7 @@ ColumnLayout { required property var lock readonly property real centerScale: Math.min(1, (lock.screen?.height ?? 1440) / 1440) - readonly property int centerWidth: Config.lock.sizes.centerWidth * centerScale + readonly property int centerWidth: Tokens.sizes.lock.centerWidth * centerScale Layout.preferredWidth: centerWidth Layout.fillWidth: false diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml index c0c1bfd3..d0001e23 100644 --- a/modules/lock/LockSurface.qml +++ b/modules/lock/LockSurface.qml @@ -144,14 +144,14 @@ WlSessionLockSurface { Anim { target: lockContent property: "implicitWidth" - to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio + to: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio duration: Tokens.anim.durations.expressiveDefaultSpatial easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } Anim { target: lockContent property: "implicitHeight" - to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult + to: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult duration: Tokens.anim.durations.expressiveDefaultSpatial easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial } @@ -219,8 +219,8 @@ WlSessionLockSurface { id: content anchors.centerIn: parent - width: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio - Tokens.padding.large * 2 - height: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult - Tokens.padding.large * 2 + width: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio - Tokens.padding.large * 2 + height: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult - Tokens.padding.large * 2 lock: root opacity: 0 diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml index c8e5426e..2fdb6fb1 100644 --- a/modules/lock/NotifGroup.qml +++ b/modules/lock/NotifGroup.qml @@ -64,8 +64,8 @@ StyledRect { Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image + implicitWidth: Tokens.sizes.notifs.image + implicitHeight: Tokens.sizes.notifs.image Component { id: imageComp @@ -73,12 +73,12 @@ StyledRect { Image { source: Qt.resolvedUrl(root.image) fillMode: Image.PreserveAspectCrop - sourceSize.width: Config.notifs.sizes.image - sourceSize.height: Config.notifs.sizes.image + sourceSize.width: Tokens.sizes.notifs.image + sourceSize.height: Tokens.sizes.notifs.image cache: false asynchronous: true - width: Config.notifs.sizes.image - height: Config.notifs.sizes.image + width: Tokens.sizes.notifs.image + height: Tokens.sizes.notifs.image } } @@ -86,7 +86,7 @@ StyledRect { id: appIconComp ColouredIcon { - implicitSize: Math.round(Config.notifs.sizes.image * 0.6) + implicitSize: Math.round(Tokens.sizes.notifs.image * 0.6) source: Quickshell.iconPath(root.appIcon) colour: root.urgency === "critical" ? Colours.palette.m3onError : root.urgency === "low" ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer layer.enabled: root.appIcon.endsWith("symbolic") @@ -122,15 +122,15 @@ StyledRect { active: root.appIcon && root.image sourceComponent: StyledRect { - implicitWidth: Config.notifs.sizes.badge - implicitHeight: Config.notifs.sizes.badge + implicitWidth: Tokens.sizes.notifs.badge + implicitHeight: Tokens.sizes.notifs.badge color: root.urgency === "critical" ? Colours.palette.m3error : root.urgency === "low" ? Colours.palette.m3surfaceContainerHighest : Colours.palette.m3secondaryContainer radius: Tokens.rounding.full ColouredIcon { anchors.centerIn: parent - implicitSize: Math.round(Config.notifs.sizes.badge * 0.6) + implicitSize: Math.round(Tokens.sizes.notifs.badge * 0.6) source: Quickshell.iconPath(root.appIcon) colour: root.urgency === "critical" ? Colours.palette.m3onError : root.urgency === "low" ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer layer.enabled: root.appIcon.endsWith("symbolic") diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index c9f934aa..e32b84c6 100644 --- a/modules/notifications/Content.qml +++ b/modules/notifications/Content.qml @@ -19,7 +19,7 @@ Item { anchors.bottom: parent.bottom anchors.right: parent.right - implicitWidth: Config.notifs.sizes.width + padding * 2 + implicitWidth: Tokens.sizes.notifs.width + padding * 2 implicitHeight: { const count = list.count; if (count === 0) @@ -170,7 +170,7 @@ Item { Anim { target: notif property: "x" - to: (notif.x >= 0 ? Config.notifs.sizes.width : -Config.notifs.sizes.width) * 2 + to: (notif.x >= 0 ? Tokens.sizes.notifs.width : -Tokens.sizes.notifs.width) * 2 duration: Tokens.anim.durations.normal easing.bezierCurve: Tokens.anim.curves.emphasized } diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index b7d90fe7..2d4c4901 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -24,10 +24,10 @@ StyledRect { color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer radius: Tokens.rounding.normal - implicitWidth: Config.notifs.sizes.width + implicitWidth: Tokens.sizes.notifs.width implicitHeight: inner.implicitHeight - x: Config.notifs.sizes.width + x: Tokens.sizes.notifs.width Component.onCompleted: { x = 0; modelData.lock(this); @@ -68,7 +68,7 @@ StyledRect { if (!containsMouse) root.modelData.timer.start(); - if (Math.abs(root.x) < Config.notifs.sizes.width * Config.notifs.clearThreshold) + if (Math.abs(root.x) < Tokens.sizes.notifs.width * Config.notifs.clearThreshold) root.x = 0; else root.modelData.popup = false; @@ -114,21 +114,21 @@ StyledRect { anchors.left: parent.left anchors.top: parent.top - width: Config.notifs.sizes.image - height: Config.notifs.sizes.image + width: Tokens.sizes.notifs.image + height: Tokens.sizes.notifs.image visible: root.hasImage || root.hasAppIcon sourceComponent: ClippingRectangle { radius: Tokens.rounding.full - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image + implicitWidth: Tokens.sizes.notifs.image + implicitHeight: Tokens.sizes.notifs.image Image { anchors.fill: parent source: Qt.resolvedUrl(root.modelData.image) fillMode: Image.PreserveAspectCrop - sourceSize.width: Config.notifs.sizes.image - sourceSize.height: Config.notifs.sizes.image + sourceSize.width: Tokens.sizes.notifs.image + sourceSize.height: Tokens.sizes.notifs.image cache: false asynchronous: true } @@ -149,8 +149,8 @@ StyledRect { sourceComponent: StyledRect { radius: Tokens.rounding.full color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) : Colours.palette.m3secondaryContainer - implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image - implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image + implicitWidth: root.hasImage ? Tokens.sizes.notifs.badge : Tokens.sizes.notifs.image + implicitHeight: root.hasImage ? Tokens.sizes.notifs.badge : Tokens.sizes.notifs.image Loader { id: icon diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index b0022fd6..3a82f0d0 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -38,8 +38,8 @@ Item { Audio.decrementVolume(); } - implicitWidth: Config.osd.sizes.sliderWidth - implicitHeight: Config.osd.sizes.sliderHeight + implicitWidth: Tokens.sizes.osd.sliderWidth + implicitHeight: Tokens.sizes.osd.sliderHeight FilledSlider { anchors.fill: parent @@ -63,8 +63,8 @@ Item { Audio.decrementSourceVolume(); } - implicitWidth: Config.osd.sizes.sliderWidth - implicitHeight: Config.osd.sizes.sliderHeight + implicitWidth: Tokens.sizes.osd.sliderWidth + implicitHeight: Tokens.sizes.osd.sliderHeight FilledSlider { anchors.fill: parent @@ -92,8 +92,8 @@ Item { monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement); } - implicitWidth: Config.osd.sizes.sliderWidth - implicitHeight: Config.osd.sizes.sliderHeight + implicitWidth: Tokens.sizes.osd.sliderWidth + implicitHeight: Tokens.sizes.osd.sliderHeight FilledSlider { anchors.fill: parent @@ -110,7 +110,7 @@ Item { required property bool shouldBeActive asynchronous: true - Layout.preferredHeight: shouldBeActive ? Config.osd.sizes.sliderHeight : 0 + Layout.preferredHeight: shouldBeActive ? Tokens.sizes.osd.sliderHeight : 0 opacity: shouldBeActive ? 1 : 0 active: opacity > 0 visible: active diff --git a/modules/session/Content.qml b/modules/session/Content.qml index b84a5a42..45fc0283 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -46,8 +46,8 @@ Column { } AnimatedImage { - width: Config.session.sizes.button - height: Config.session.sizes.button + width: Tokens.sizes.session.button + height: Tokens.sizes.session.button sourceSize.width: width sourceSize.height: height @@ -82,8 +82,8 @@ Column { required property string icon required property list command - implicitWidth: Config.session.sizes.button - implicitHeight: Config.session.sizes.button + implicitWidth: Tokens.sizes.session.button + implicitHeight: Tokens.sizes.session.button radius: Tokens.rounding.large color: button.activeFocus ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml index 3d624bfc..2616d805 100644 --- a/modules/sidebar/NotifGroup.qml +++ b/modules/sidebar/NotifGroup.qml @@ -53,7 +53,7 @@ StyledRect { readonly property int nonAnimHeight: { const headerHeight = header.implicitHeight + (root.expanded ? Math.round(Tokens.spacing.small / 2) : 0); const columnHeight = headerHeight + notifList.layoutHeight + column.Layout.topMargin + column.Layout.bottomMargin; - return Math.round(Math.max(Config.notifs.sizes.image, columnHeight) + Tokens.padding.normal * 2); + return Math.round(Math.max(Tokens.sizes.notifs.image, columnHeight) + Tokens.padding.normal * 2); } readonly property bool expanded: props.expandedNotifs.includes(modelData) @@ -91,8 +91,8 @@ StyledRect { Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image + implicitWidth: Tokens.sizes.notifs.image + implicitHeight: Tokens.sizes.notifs.image Component { id: imageComp @@ -100,12 +100,12 @@ StyledRect { Image { source: Qt.resolvedUrl(root.image) fillMode: Image.PreserveAspectCrop - sourceSize.width: Config.notifs.sizes.image - sourceSize.height: Config.notifs.sizes.image + sourceSize.width: Tokens.sizes.notifs.image + sourceSize.height: Tokens.sizes.notifs.image cache: false asynchronous: true - width: Config.notifs.sizes.image - height: Config.notifs.sizes.image + width: Tokens.sizes.notifs.image + height: Tokens.sizes.notifs.image } } @@ -113,7 +113,7 @@ StyledRect { id: appIconComp ColouredIcon { - implicitSize: Math.round(Config.notifs.sizes.image * 0.6) + implicitSize: Math.round(Tokens.sizes.notifs.image * 0.6) source: Quickshell.iconPath(root.appIcon) colour: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer layer.enabled: root.appIcon.endsWith("symbolic") @@ -149,15 +149,15 @@ StyledRect { active: root.appIcon && root.image sourceComponent: StyledRect { - implicitWidth: Config.notifs.sizes.badge - implicitHeight: Config.notifs.sizes.badge + implicitWidth: Tokens.sizes.notifs.badge + implicitHeight: Tokens.sizes.notifs.badge color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.urgency === NotificationUrgency.Low ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3secondaryContainer radius: Tokens.rounding.full ColouredIcon { anchors.centerIn: parent - implicitSize: Math.round(Config.notifs.sizes.badge * 0.6) + implicitSize: Math.round(Tokens.sizes.notifs.badge * 0.6) source: Quickshell.iconPath(root.appIcon) colour: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer layer.enabled: root.appIcon.endsWith("symbolic") diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml index 446a5b30..e2d8f5a6 100644 --- a/modules/sidebar/Wrapper.qml +++ b/modules/sidebar/Wrapper.qml @@ -15,7 +15,7 @@ Item { visible: offsetScale < 1 anchors.rightMargin: (-implicitWidth - 5) * offsetScale - implicitWidth: Config.sidebar.sizes.width + implicitWidth: Tokens.sizes.sidebar.width opacity: 1 - offsetScale Behavior on offsetScale { @@ -37,7 +37,7 @@ Item { active: root.shouldBeActive || root.visible sourceComponent: Content { - implicitWidth: Config.sidebar.sizes.width - Tokens.padding.large * 2 + implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.large * 2 props: root.props visibilities: root.visibilities } diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index 6d666894..c8f87c36 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -29,7 +29,7 @@ Item { visible: offsetScale < 1 anchors.bottomMargin: (-implicitHeight - 5) * offsetScale implicitHeight: content.implicitHeight + content.anchors.margins * 2 - implicitWidth: sidebar.width * (1 - sidebar.offsetScale) * horizontalStretch * sidebarLerp + Config.utilities.sizes.width * (1 - sidebarLerp) + implicitWidth: sidebar.width * (1 - sidebar.offsetScale) * horizontalStretch * sidebarLerp + Tokens.sizes.utilities.width * (1 - sidebarLerp) opacity: 1 - offsetScale states: State { diff --git a/modules/utilities/toasts/Toasts.qml b/modules/utilities/toasts/Toasts.qml index 32fb56fc..7c15bf82 100644 --- a/modules/utilities/toasts/Toasts.qml +++ b/modules/utilities/toasts/Toasts.qml @@ -23,7 +23,7 @@ Item { return false; } - implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.normal * 2 + implicitWidth: Tokens.sizes.utilities.toastWidth - Tokens.padding.normal * 2 implicitHeight: { let h = -spacing; for (let i = 0; i < repeater.count; i++) { diff --git a/modules/windowinfo/WindowInfo.qml b/modules/windowinfo/WindowInfo.qml index a0079128..2c31d209 100644 --- a/modules/windowinfo/WindowInfo.qml +++ b/modules/windowinfo/WindowInfo.qml @@ -13,7 +13,7 @@ Item { required property HyprlandToplevel client implicitWidth: child.implicitWidth - implicitHeight: screen.height * Config.winfo.sizes.heightMult + implicitHeight: screen.height * Tokens.sizes.winfo.heightMult RowLayout { id: child @@ -31,7 +31,7 @@ Item { ColumnLayout { spacing: Tokens.spacing.normal - Layout.preferredWidth: Config.winfo.sizes.detailsWidth + Layout.preferredWidth: Tokens.sizes.winfo.detailsWidth Layout.fillHeight: true StyledRect { diff --git a/services/NotifData.qml b/services/NotifData.qml index ac781ad5..31ff7d2f 100644 --- a/services/NotifData.qml +++ b/services/NotifData.qml @@ -54,14 +54,14 @@ QtObject { // qmllint disable uncreatable-type PanelWindow { // qmllint enable uncreatable-type - implicitWidth: Config.notifs.sizes.image - implicitHeight: Config.notifs.sizes.image + implicitWidth: Tokens.sizes.notifs.image + implicitHeight: Tokens.sizes.notifs.image color: "transparent" mask: Region {} Image { function tryCache(): void { - if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image) + if (status !== Image.Ready || width != Tokens.sizes.notifs.image || height != Tokens.sizes.notifs.image) return; const cacheKey = notif.appName + notif.summary + notif.id;