From 5ef8b1a18937710e2c8518e900e400decbceef72 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Mon, 4 May 2020 17:18:04 -0600 Subject: [PATCH] Use font: instead of font.pointSize: where possible Summary: Otherwise we're discarding style information possibly set in the user's small font choices when we want to set a smaller font. Test Plan: Stuff that's suposta look small still looks small Reviewers: #plasma, cblack Reviewed By: #plasma, cblack Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D29436 --- examples/applets/testcomponents/contents/ui/ThemePage.qml | 2 +- examples/applets/testtheme/contents/ui/FontTest.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/applets/testcomponents/contents/ui/ThemePage.qml b/examples/applets/testcomponents/contents/ui/ThemePage.qml index b120b7d64..eda816014 100644 --- a/examples/applets/testcomponents/contents/ui/ThemePage.qml +++ b/examples/applets/testcomponents/contents/ui/ThemePage.qml @@ -50,7 +50,7 @@ PlasmaComponents.Page { PlasmaComponents.Label { text: "This is the smallest readable Font." - font.pointSize: theme.smallestFont.pointSize + font: theme.smallestFont } Row { diff --git a/examples/applets/testtheme/contents/ui/FontTest.qml b/examples/applets/testtheme/contents/ui/FontTest.qml index 161e7de72..3c58a2581 100644 --- a/examples/applets/testtheme/contents/ui/FontTest.qml +++ b/examples/applets/testtheme/contents/ui/FontTest.qml @@ -62,7 +62,7 @@ Column { FontGizmo { id: giz1 - font.pointSize: theme.smallestFont.pointSize + font: theme.smallestFont //font.family: "Oxygen-Sans" }