From a3e84b555e30ca8b85e57170c9d6c380cd356b8c Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Tue, 21 Apr 2026 01:02:27 +1000 Subject: [PATCH] refactor: migrate launcher to new font API --- modules/launcher/ContentList.qml | 7 +++---- modules/launcher/items/ActionItem.qml | 6 +++--- modules/launcher/items/AppItem.qml | 4 ++-- modules/launcher/items/CalcItem.qml | 6 +++--- modules/launcher/items/SchemeItem.qml | 6 +++--- modules/launcher/items/VariantItem.qml | 8 ++++---- modules/launcher/items/WallpaperItem.qml | 5 ++--- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index 8975c4b3..25b9f395 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -119,7 +119,7 @@ Item { MaterialIcon { text: root.state === "wallpapers" ? "wallpaper_slideshow" : "manage_search" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.extraLarge + font: Tokens.font.icon.extraLarge anchors.verticalCenter: parent.verticalCenter } @@ -130,14 +130,13 @@ Item { StyledText { text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.larger - font.weight: 500 + font: Tokens.font.body.builders.large.weight(500).build() } StyledText { text: root.state === "wallpapers" && Wallpapers.list.length === 0 ? qsTr("Try putting some wallpapers in %1").arg(Paths.shortenHome(Paths.wallsdir)) : qsTr("Try searching for something else") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } } diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml index 465040df..bfb1a336 100644 --- a/modules/launcher/items/ActionItem.qml +++ b/modules/launcher/items/ActionItem.qml @@ -29,7 +29,7 @@ Item { id: icon text: root.modelData?.icon ?? "" - font.pointSize: Tokens.font.size.extraLarge + font: Tokens.font.icon.extraLarge anchors.verticalCenter: parent.verticalCenter } @@ -46,14 +46,14 @@ Item { id: name text: root.modelData?.name ?? "" - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } StyledText { id: desc text: root.modelData?.desc ?? "" - font.pointSize: Tokens.font.size.small + font: Tokens.font.body.small color: Colours.palette.m3outline elide: Text.ElideRight diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml index 86dfc2d5..ba6b0aab 100644 --- a/modules/launcher/items/AppItem.qml +++ b/modules/launcher/items/AppItem.qml @@ -54,14 +54,14 @@ Item { id: name text: root.modelData?.name ?? "" - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } StyledText { id: comment text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? "" - font.pointSize: Tokens.font.size.small + font: Tokens.font.body.small color: Colours.palette.m3outline elide: Text.ElideRight diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index f6e0d533..07f2da2c 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -42,7 +42,7 @@ Item { MaterialIcon { text: "function" - font.pointSize: Tokens.font.size.extraLarge + font: Tokens.font.icon.extraLarge Layout.alignment: Qt.AlignVCenter } @@ -94,7 +94,7 @@ Item { text: qsTr("Open in calculator") color: Colours.palette.m3onTertiary - font.pointSize: Tokens.font.size.normal + font: Tokens.font.label.medium opacity: stateLayer.containsMouse ? 1 : 0 @@ -112,7 +112,7 @@ Item { text: "open_in_new" color: Colours.palette.m3onTertiary - font.pointSize: Tokens.font.size.large + font: Tokens.font.icon.large } Behavior on implicitWidth { diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml index f3ac5eef..f1b95ed9 100644 --- a/modules/launcher/items/SchemeItem.qml +++ b/modules/launcher/items/SchemeItem.qml @@ -69,12 +69,12 @@ Item { StyledText { text: root.modelData?.flavour ?? "" - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } StyledText { text: root.modelData?.name ?? "" - font.pointSize: Tokens.font.size.small + font: Tokens.font.body.small color: Colours.palette.m3outline elide: Text.ElideRight @@ -95,7 +95,7 @@ Item { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.large + font: Tokens.font.icon.large } } } diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml index 87443f76..75292de6 100644 --- a/modules/launcher/items/VariantItem.qml +++ b/modules/launcher/items/VariantItem.qml @@ -30,7 +30,7 @@ Item { id: icon text: root.modelData?.icon ?? "" - font.pointSize: Tokens.font.size.extraLarge + font: Tokens.font.icon.extraLarge anchors.verticalCenter: parent.verticalCenter } @@ -45,12 +45,12 @@ Item { StyledText { text: root.modelData?.name ?? "" - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } StyledText { text: root.modelData?.description ?? "" - font.pointSize: Tokens.font.size.small + font: Tokens.font.body.small color: Colours.palette.m3outline elide: Text.ElideRight @@ -71,7 +71,7 @@ Item { sourceComponent: MaterialIcon { text: "check" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.large + font: Tokens.font.icon.large } } } diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml index 2f3841dc..7fcd4c45 100644 --- a/modules/launcher/items/WallpaperItem.qml +++ b/modules/launcher/items/WallpaperItem.qml @@ -58,8 +58,7 @@ Item { anchors.centerIn: parent text: "image" color: Colours.tPalette.m3outline - font.pointSize: Tokens.font.size.extraLarge * 2 - font.weight: 600 + font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(600).build() } CachingImage { @@ -83,7 +82,7 @@ Item { elide: Text.ElideRight renderType: Text.QtRendering text: root.modelData.relativePath - font.pointSize: Tokens.font.size.normal + font: Tokens.font.label.medium } Behavior on scale {