From ac13eec68c1335bb0d5a982b9b5c2ebc086403ac Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Tue, 9 Jun 2026 15:39:12 +1000 Subject: [PATCH] fix: button comps' styling --- components/controls/ButtonBase.qml | 2 +- components/controls/IconTextButton.qml | 5 ++--- components/controls/TextButton.qml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/controls/ButtonBase.qml b/components/controls/ButtonBase.qml index ab263148..48231e47 100644 --- a/components/controls/ButtonBase.qml +++ b/components/controls/ButtonBase.qml @@ -21,7 +21,7 @@ StyledRect { property alias shapeMorph: stateLayer.shapeMorph property bool fillWidth // For ButtonRow - property font font + property font font: Tokens.font.body.small property int type: ButtonBase.Filled property real padding diff --git a/components/controls/IconTextButton.qml b/components/controls/IconTextButton.qml index 6859cb68..cf4faeb8 100644 --- a/components/controls/IconTextButton.qml +++ b/components/controls/IconTextButton.qml @@ -48,12 +48,11 @@ ButtonBase { id: iconLabel Layout.alignment: Qt.AlignVCenter - Layout.topMargin: Math.round(fontInfo.pointSize * 0.0575) color: root.onColour fill: root.internalChecked ? 1 : 0 fontStyle: { const f = Qt.font(root.font); - f.pointSize = Math.round(root.font.pointSize * 1.1); + f.pointSize = Math.round(root.font.pointSize * 1.2); return f; } @@ -68,7 +67,7 @@ ButtonBase { id: label Layout.alignment: Qt.AlignVCenter - Layout.topMargin: -Math.round(iconLabel.fontInfo.pointSize * 0.0575) + Layout.topMargin: 1 color: root.onColour font: root.font } diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml index 5cfff6e8..35971525 100644 --- a/components/controls/TextButton.qml +++ b/components/controls/TextButton.qml @@ -39,5 +39,6 @@ ButtonBase { anchors.centerIn: parent color: root.onColour + font: root.font } }