From 661529f1f430eab8ab5f09b7b73cb0535bb9b8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 4 Nov 2023 22:06:05 +0800 Subject: [PATCH] update --- src/Qt5/imports/FluentUI/Controls/FluIconButton.qml | 6 +++--- src/Qt6/imports/FluentUI/Controls/FluIconButton.qml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluIconButton.qml b/src/Qt5/imports/FluentUI/Controls/FluIconButton.qml index f73b5258..f76e3c82 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluIconButton.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluIconButton.qml @@ -6,7 +6,6 @@ import FluentUI 1.0 Button { display: Button.IconOnly property int iconSize: 20 - property int textSize: 12 property int iconSource property bool disabled: false property int radius:4 @@ -49,6 +48,7 @@ Button { verticalPadding: 8 horizontalPadding: 8 enabled: !disabled + font:FluTextStyle.Caption background: Rectangle{ implicitWidth: 30 implicitHeight: 30 @@ -83,7 +83,7 @@ Button { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter visible: display !== Button.IconOnly color: control.textColor - font.pixelSize: control.textSize + font: control.font } } } @@ -100,7 +100,7 @@ Button { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter visible: display !== Button.IconOnly color: control.textColor - font.pixelSize: control.textSize + font: control.font } } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluIconButton.qml b/src/Qt6/imports/FluentUI/Controls/FluIconButton.qml index 13435a62..b52dcff6 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluIconButton.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluIconButton.qml @@ -7,7 +7,6 @@ import FluentUI Button { display: Button.IconOnly property int iconSize: 20 - property int textSize: 12 property int iconSource property bool disabled: false property int radius:4 @@ -50,6 +49,7 @@ Button { verticalPadding: 8 horizontalPadding: 8 enabled: !disabled + font:FluTextStyle.Caption background: Rectangle{ implicitWidth: 30 implicitHeight: 30 @@ -84,7 +84,7 @@ Button { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter visible: display !== Button.IconOnly color: control.textColor - font.pixelSize: control.textSize + font: control.font } } } @@ -101,7 +101,7 @@ Button { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter visible: display !== Button.IconOnly color: control.textColor - font.pixelSize: control.textSize + font: control.font } } }