icons: use variable axes

2025-06-26 21:05:35 +10:00 · 2025-06-26 21:05:35 +10:00 · 7ddf40d2ea
commit 7ddf40d2ea
parent 1362e22d79
8 changed files with 6 additions and 22 deletions
--- a/modules/background/Wallpaper.qml
+++ b/modules/background/Wallpaper.qml
@ -40,9 +40,6 @@ Item {
                    text: "sentiment_stressed"
                    color: Colours.palette.m3onSurfaceVariant
                    font.pointSize: Appearance.font.size.extraLarge * 5
-                    font.variableAxes: ({
-                            opsz: Appearance.font.size.extraLarge * 5
-                        })
                }

                Column {
--- a/modules/bar/popouts/ActiveWindow.qml
+++ b/modules/bar/popouts/ActiveWindow.qml
@ -80,9 +80,6 @@ Item {
                    text: "chevron_right"

                    font.pointSize: Appearance.font.size.large
-                    font.variableAxes: ({
-                            opsz: Appearance.font.size.large
-                        })
                }
            }
        }
--- a/modules/dashboard/dash/Weather.qml
+++ b/modules/dashboard/dash/Weather.qml
@ -26,9 +26,6 @@ Item {
        text: Weather.icon || "cloud_alert"
        color: Colours.palette.m3secondary
        font.pointSize: Appearance.font.size.extraLarge * 2
-        font.variableAxes: ({
-                opsz: Appearance.font.size.extraLarge * 1.2
-            })
    }

    Column {
--- a/modules/lock/Notification.qml
+++ b/modules/lock/Notification.qml
@ -158,9 +158,6 @@ StyledRect {

                    color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer
                    font.pointSize: Appearance.font.size.large
-                    font.variableAxes: ({
-                            opsz: Appearance.font.size.large
-                        })
                }
            }
        }
--- a/modules/lock/WeatherInfo.qml
+++ b/modules/lock/WeatherInfo.qml
@ -27,9 +27,6 @@ RowLayout {
        text: Weather.icon || "cloud_alert"
        color: Colours.palette.m3secondary
        font.pointSize: Appearance.font.size.extraLarge * 2.5
-        font.variableAxes: ({
-                opsz: Appearance.font.size.extraLarge * 1.2
-            })
    }

    ColumnLayout {
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@ -186,9 +186,6 @@ StyledRect {

                        color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onTertiaryContainer
                        font.pointSize: Appearance.font.size.large
-                        font.variableAxes: ({
-                                opsz: Appearance.font.size.large
-                            })
                    }
                }
            }
--- a/modules/windowinfo/Preview.qml
+++ b/modules/windowinfo/Preview.qml
@ -45,9 +45,6 @@ Item {
                    text: "web_asset_off"
                    color: Colours.palette.m3outline
                    font.pointSize: Appearance.font.size.extraLarge * 3
-                    font.variableAxes: ({
-                            opsz: Appearance.font.size.extraLarge * 3
-                        })
                }

                StyledText {
--- a/widgets/MaterialIcon.qml
+++ b/widgets/MaterialIcon.qml
@ -1,11 +1,16 @@
+import "root:/services"
 import "root:/config"

 StyledText {
    property real fill
+    property int grade: Colours.light ? 0 : -25

    font.family: Appearance.font.family.material
    font.pointSize: Appearance.font.size.larger
    font.variableAxes: ({
-            FILL: fill.toFixed(1)
+            FILL: fill.toFixed(1),
+            GRAD: grade,
+            opsz: fontInfo.pixelSize,
+            wght: fontInfo.weight
        })
 }