From 61555294e635e4eb0a527ed4c4f614270a28e7bc Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Tue, 21 Apr 2026 01:05:29 +1000 Subject: [PATCH] refactor: migrate background/winfo/session to new font API --- modules/background/DesktopClock.qml | 21 +++++++-------------- modules/background/Wallpaper.qml | 7 +++---- modules/session/Content.qml | 3 +-- modules/windowinfo/Buttons.qml | 4 ++-- modules/windowinfo/Details.qml | 7 +++---- modules/windowinfo/Preview.qml | 7 +++---- 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index 463e32b5..f90329e6 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -81,14 +81,13 @@ Item { StyledText { text: Time.hourStr - font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale - font.weight: Font.Bold + font: Tokens.font.clock.size(Tokens.font.headline.medium.pointSize * 3 * root.clockScale).weight(Font.Bold).build() color: root.safePrimary } StyledText { text: ":" - font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale + font: Tokens.font.clock.size(Tokens.font.headline.medium.pointSize * 3 * root.clockScale).build() color: root.safeTertiary opacity: 0.8 Layout.topMargin: -Tokens.padding.large * 1.5 * root.clockScale @@ -96,8 +95,7 @@ Item { StyledText { text: Time.minuteStr - font.pointSize: Tokens.font.size.extraLarge * 3 * root.clockScale - font.weight: Font.Bold + font: Tokens.font.clock.size(Tokens.font.headline.medium.pointSize * 3 * root.clockScale).weight(Font.Bold).build() color: root.safeSecondary } @@ -111,7 +109,7 @@ Item { sourceComponent: StyledText { text: Time.amPmStr - font.pointSize: Tokens.font.size.large * root.clockScale + font: Tokens.font.clock.size(Tokens.font.title.medium.pointSize * root.clockScale).build() color: root.safeSecondary } } @@ -132,24 +130,19 @@ Item { StyledText { text: Time.format("MMMM").toUpperCase() - font.pointSize: Tokens.font.size.large * root.clockScale - font.letterSpacing: 4 - font.weight: Font.Bold + font: Tokens.font.clock.size(Tokens.font.title.medium.pointSize * root.clockScale).letterSpacing(4).weight(Font.Bold).build() color: root.safeSecondary } StyledText { text: Time.format("dd") - font.pointSize: Tokens.font.size.extraLarge * root.clockScale - font.letterSpacing: 2 - font.weight: Font.Medium + font: Tokens.font.clock.size(Tokens.font.headline.medium.pointSize * root.clockScale).letterSpacing(2).weight(Font.Medium).build() color: root.safePrimary } StyledText { text: Time.format("dddd") - font.pointSize: Tokens.font.size.larger * root.clockScale - font.letterSpacing: 2 + font: Tokens.font.clock.size(Tokens.font.body.large.pointSize * root.clockScale).letterSpacing(2).build() color: root.safeSecondary } } diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index f1421797..78071a25 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -48,7 +48,7 @@ Item { MaterialIcon { text: "sentiment_stressed" color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.extraLarge * 5 + font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 5).build() } Column { @@ -58,8 +58,7 @@ Item { StyledText { text: qsTr("Wallpaper missing?") color: Colours.palette.m3onSurfaceVariant - font.pointSize: Tokens.font.size.extraLarge * 2 - font.bold: true + font: Tokens.font.body.builders.large.size(28 * 2).weight(Font.Bold).build() } StyledRect { @@ -91,7 +90,7 @@ Item { text: qsTr("Set it now!") color: Colours.palette.m3onPrimary - font.pointSize: Tokens.font.size.large + font: Tokens.font.body.large } } } diff --git a/modules/session/Content.qml b/modules/session/Content.qml index fb6a27f6..d01b0eae 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -125,8 +125,7 @@ Column { text: button.icon color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface - font.pointSize: Tokens.font.size.extraLarge - font.weight: 500 + font: Tokens.font.icon.builders.extraLarge.weight(500).build() } } } diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml index 14a3b2db..1bf0bd38 100644 --- a/modules/windowinfo/Buttons.qml +++ b/modules/windowinfo/Buttons.qml @@ -49,7 +49,7 @@ ColumnLayout { animate: true text: root.moveToWsExpanded ? "expand_more" : "keyboard_arrow_right" color: Colours.palette.m3onPrimary - font.pointSize: Tokens.font.size.large + font: Tokens.font.icon.large } } } @@ -161,7 +161,7 @@ ColumnLayout { animate: true color: parent.onColor - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } } } diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml index e39e8ff7..579ff3e5 100644 --- a/modules/windowinfo/Details.qml +++ b/modules/windowinfo/Details.qml @@ -19,15 +19,14 @@ ColumnLayout { text: root.client?.title ?? qsTr("No active client") wrapMode: Text.WrapAtWordBoundaryOrAnywhere - font.pointSize: Tokens.font.size.large - font.weight: 500 + font: Tokens.font.body.builders.large.weight(500).build() } Label { text: root.client?.lastIpcObject.class ?? qsTr("No active client") color: Colours.palette.m3tertiary - font.pointSize: Tokens.font.size.larger + font: Tokens.font.body.large } StyledRect { @@ -149,7 +148,7 @@ ColumnLayout { text: detail.text elide: Text.ElideRight - font.pointSize: Tokens.font.size.normal + font: Tokens.font.body.medium } } diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml index a31e1154..e0ff2537 100644 --- a/modules/windowinfo/Preview.qml +++ b/modules/windowinfo/Preview.qml @@ -44,22 +44,21 @@ Item { Layout.alignment: Qt.AlignHCenter text: "web_asset_off" color: Colours.palette.m3outline - font.pointSize: Tokens.font.size.extraLarge * 3 + font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build() } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("No active client") color: Colours.palette.m3outline - font.pointSize: Tokens.font.size.extraLarge - font.weight: 500 + font: Tokens.font.body.builders.large.size(28).weight(500).build() } StyledText { Layout.alignment: Qt.AlignHCenter text: qsTr("Try switching to a window") color: Colours.palette.m3outline - font.pointSize: Tokens.font.size.large + font: Tokens.font.body.large } } }