From e7cea728259a00683dc94e1ecf03fab99e527eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Wed, 5 Apr 2023 16:37:27 +0800 Subject: [PATCH] update --- example/page/AboutPage.qml | 2 +- src/controls/FluButton.qml | 2 +- src/controls/FluCheckBox.qml | 2 +- src/controls/FluColorPicker.qml | 3 +-- src/controls/FluDropDownButton.qml | 2 +- src/controls/FluFilledButton.qml | 2 +- src/controls/FluFlipView.qml | 4 ++-- src/controls/FluIconButton.qml | 2 +- src/controls/FluMultilineTextBox.qml | 2 +- src/controls/FluRadioButton.qml | 3 +-- src/controls/FluScrollBar.qml | 2 -- src/controls/FluTextBox.qml | 2 +- src/controls/FluTextButton.qml | 2 +- src/controls/FluToggleSwitch.qml | 6 +++--- src/res.qrc | 3 +++ 15 files changed, 19 insertions(+), 20 deletions(-) diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 2cc30fd..9f9431e 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -36,7 +36,7 @@ FluWindow { fontStyle: FluText.Title } FluText{ - text:"v1.1.9" + text:"v1.2.0" fontStyle: FluText.Body Layout.alignment: Qt.AlignBottom } diff --git a/src/controls/FluButton.qml b/src/controls/FluButton.qml index 2b4c197..a9a99d1 100644 --- a/src/controls/FluButton.qml +++ b/src/controls/FluButton.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -Button { +FluControl { property bool disabled: false property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) diff --git a/src/controls/FluCheckBox.qml b/src/controls/FluCheckBox.qml index e98fb45..c75b648 100644 --- a/src/controls/FluCheckBox.qml +++ b/src/controls/FluCheckBox.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import FluentUI -Button { +FluControl { property bool selected: false property var clickFunc diff --git a/src/controls/FluColorPicker.qml b/src/controls/FluColorPicker.qml index 4c81d18..7c6989e 100644 --- a/src/controls/FluColorPicker.qml +++ b/src/controls/FluColorPicker.qml @@ -4,8 +4,7 @@ import QtQuick.Layouts import QtQuick.Window import FluentUI - -Button{ +FluControl{ id:control width: 36 height: 36 diff --git a/src/controls/FluDropDownButton.qml b/src/controls/FluDropDownButton.qml index 89ac80d..cebee9d 100644 --- a/src/controls/FluDropDownButton.qml +++ b/src/controls/FluDropDownButton.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Window import FluentUI -Button { +FluControl { property bool disabled: false property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) diff --git a/src/controls/FluFilledButton.qml b/src/controls/FluFilledButton.qml index 1e06cef..bb0809a 100644 --- a/src/controls/FluFilledButton.qml +++ b/src/controls/FluFilledButton.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -Button { +FluControl { property bool disabled: false property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark diff --git a/src/controls/FluFlipView.qml b/src/controls/FluFlipView.qml index a08ccea..2d83e86 100644 --- a/src/controls/FluFlipView.qml +++ b/src/controls/FluFlipView.qml @@ -52,7 +52,7 @@ Item{ anchors.fill: parent } - Button{ + FluControl{ id:btn_start height: vertical ? 20 : 40 width: vertical ? 40 : 20 @@ -82,7 +82,7 @@ Item{ } } - Button{ + FluControl{ id:btn_end height: vertical ? 20 : 40 width: vertical ? 40 : 20 diff --git a/src/controls/FluIconButton.qml b/src/controls/FluIconButton.qml index ecd0b9b..ad7e644 100644 --- a/src/controls/FluIconButton.qml +++ b/src/controls/FluIconButton.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -Button { +FluControl { property int iconSize: 20 property int iconSource diff --git a/src/controls/FluMultilineTextBox.qml b/src/controls/FluMultilineTextBox.qml index 047d0b4..17130bb 100644 --- a/src/controls/FluMultilineTextBox.qml +++ b/src/controls/FluMultilineTextBox.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -TextArea{ +FluTextArea{ property int fontStyle: FluText.Body property int pixelSize : FluTheme.textSize diff --git a/src/controls/FluRadioButton.qml b/src/controls/FluRadioButton.qml index f17334a..4e389e4 100644 --- a/src/controls/FluRadioButton.qml +++ b/src/controls/FluRadioButton.qml @@ -3,8 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import FluentUI - -Button { +FluControl { property bool selected: false property bool disabled: false diff --git a/src/controls/FluScrollBar.qml b/src/controls/FluScrollBar.qml index afba16e..84a3fa1 100644 --- a/src/controls/FluScrollBar.qml +++ b/src/controls/FluScrollBar.qml @@ -114,11 +114,9 @@ ScrollBar { anchors.fill: parent onEntered: { timer.restart() - console.debug("onEntered") } onExited: { timer.restart() - console.debug("onExited") } } } diff --git a/src/controls/FluTextBox.qml b/src/controls/FluTextBox.qml index 2d4291b..1845e1b 100644 --- a/src/controls/FluTextBox.qml +++ b/src/controls/FluTextBox.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -TextField{ +FluTextFiled{ property int fontStyle: FluText.Body property int pixelSize : FluTheme.textSize diff --git a/src/controls/FluTextButton.qml b/src/controls/FluTextButton.qml index 4b91140..77429f8 100644 --- a/src/controls/FluTextButton.qml +++ b/src/controls/FluTextButton.qml @@ -2,7 +2,7 @@ import QtQuick.Controls import FluentUI -Button { +FluControl { property bool disabled: false property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark diff --git a/src/controls/FluToggleSwitch.qml b/src/controls/FluToggleSwitch.qml index 5704293..04e6e7b 100644 --- a/src/controls/FluToggleSwitch.qml +++ b/src/controls/FluToggleSwitch.qml @@ -1,9 +1,9 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick +import QtQuick.Controls import FluentUI import QtQuick.Layouts -Button { +FluControl { property bool selected: false property var clickFunc diff --git a/src/res.qrc b/src/res.qrc index 651c54f..173210f 100644 --- a/src/res.qrc +++ b/src/res.qrc @@ -64,5 +64,8 @@ controls/FluFlipView.qml controls/FluPivot.qml controls/FluPivotItem.qml + controls/FluControl.qml + controls/FluTextFiled.qml + controls/FluTextArea.qml