From 8475ec7f0373e0b9577691c40987eb25945419a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 13 May 2023 17:30:07 +0800 Subject: [PATCH] update --- example/qml/page/T_TableView.qml | 8 -------- src/imports/FluentUI/Controls/FluButton.qml | 2 +- src/imports/FluentUI/Controls/FluDropDownButton.qml | 2 +- src/imports/FluentUI/Controls/FluFilledButton.qml | 2 +- src/imports/FluentUI/Controls/FluToggleButton.qml | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index 1576210..db47e6c 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -62,20 +62,12 @@ FluScrollablePage{ spacing: 10 FluFilledButton{ text:"编辑" - topPadding:3 - bottomPadding:3 - leftPadding:6 - rightPadding:6 onClicked:{ showSuccess(JSON.stringify(dataObject)) } } FluFilledButton{ text:"删除" - topPadding:3 - bottomPadding:3 - leftPadding:6 - rightPadding:6 onClicked:{ showError(JSON.stringify(dataObject)) } diff --git a/src/imports/FluentUI/Controls/FluButton.qml b/src/imports/FluentUI/Controls/FluButton.qml index b3cad66..709ae3a 100644 --- a/src/imports/FluentUI/Controls/FluButton.qml +++ b/src/imports/FluentUI/Controls/FluButton.qml @@ -17,7 +17,7 @@ Button { Keys.onSpacePressed: control.visualFocus&&clicked() font:FluTextStyle.Body background: Rectangle{ - implicitWidth: 100 + implicitWidth: 28 implicitHeight: 28 border.color: FluTheme.dark ? "#505050" : "#DFDFDF" border.width: 1 diff --git a/src/imports/FluentUI/Controls/FluDropDownButton.qml b/src/imports/FluentUI/Controls/FluDropDownButton.qml index 0c1f605..dadb829 100644 --- a/src/imports/FluentUI/Controls/FluDropDownButton.qml +++ b/src/imports/FluentUI/Controls/FluDropDownButton.qml @@ -20,7 +20,7 @@ Button { horizontalPadding:12 Keys.onSpacePressed: control.visualFocus&&clicked() background: Rectangle{ - implicitWidth: 100 + implicitWidth: 28 implicitHeight: 28 border.color: FluTheme.dark ? "#505050" : "#DFDFDF" border.width: 1 diff --git a/src/imports/FluentUI/Controls/FluFilledButton.qml b/src/imports/FluentUI/Controls/FluFilledButton.qml index 5ea57d6..9377a56 100644 --- a/src/imports/FluentUI/Controls/FluFilledButton.qml +++ b/src/imports/FluentUI/Controls/FluFilledButton.qml @@ -18,7 +18,7 @@ Button { font:FluTextStyle.Body horizontalPadding:12 background: Rectangle{ - implicitWidth: 100 + implicitWidth: 28 implicitHeight: 28 radius: 4 FluFocusRectangle{ diff --git a/src/imports/FluentUI/Controls/FluToggleButton.qml b/src/imports/FluentUI/Controls/FluToggleButton.qml index 419ae0e..72b29e3 100644 --- a/src/imports/FluentUI/Controls/FluToggleButton.qml +++ b/src/imports/FluentUI/Controls/FluToggleButton.qml @@ -37,7 +37,7 @@ Button { focusPolicy:Qt.TabFocus horizontalPadding:12 background: Rectangle{ - implicitWidth: 100 + implicitWidth: 28 implicitHeight: 28 radius: 4 border.color: FluTheme.dark ? "#505050" : "#DFDFDF"