From 151bb9dbfc4aee6a74f688a609ced981778476ff Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Thu, 28 Apr 2022 20:15:13 -0400 Subject: [PATCH] quicksettings: Fix delegate text size regression --- .../quicksettings/QuickSettingsFullDelegate.qml | 8 ++++---- components/mobileshell/qml/components/MarqueeLabel.qml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml index 52f13e7a..207bf44a 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml @@ -65,18 +65,18 @@ QuickSettingsDelegate { Layout.fillWidth: true elide: Text.ElideRight text: root.text - font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.8 // TODO base height off of size of delegate + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.75 // TODO base height off of size of delegate font.weight: Font.Bold } Components.MarqueeLabel { // if no status is given, just use On/Off inputText: status ? status : (enabled ? i18n("On") : i18n("Off")) - rightPadding: root.rightPadding + rightPadding: 0 // root.rightPadding + opacity: 0.6 Layout.fillWidth: true - opacity: 0.6 - font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.8 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.75 } } } diff --git a/components/mobileshell/qml/components/MarqueeLabel.qml b/components/mobileshell/qml/components/MarqueeLabel.qml index f2562451..b4c3788f 100644 --- a/components/mobileshell/qml/components/MarqueeLabel.qml +++ b/components/mobileshell/qml/components/MarqueeLabel.qml @@ -27,9 +27,9 @@ PlasmaComponents.Label { property int step: 0 TextMetrics { - id: txtMeter - font.pointSize: root.font.pointSize - text: inputText + id: txtMeter + font.pointSize: root.font.pointSize + text: inputText } Timer {