main
朱子楚\zhuzi 2023-04-05 16:37:27 +08:00
parent 93186edfbe
commit e7cea72825
15 changed files with 19 additions and 20 deletions

View File

@ -36,7 +36,7 @@ FluWindow {
fontStyle: FluText.Title fontStyle: FluText.Title
} }
FluText{ FluText{
text:"v1.1.9" text:"v1.2.0"
fontStyle: FluText.Body fontStyle: FluText.Body
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
} }

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
Button { FluControl {
property bool disabled: false 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) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)

View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import FluentUI import FluentUI
Button { FluControl {
property bool selected: false property bool selected: false
property var clickFunc property var clickFunc

View File

@ -4,8 +4,7 @@ import QtQuick.Layouts
import QtQuick.Window import QtQuick.Window
import FluentUI import FluentUI
FluControl{
Button{
id:control id:control
width: 36 width: 36
height: 36 height: 36

View File

@ -3,7 +3,7 @@ import QtQuick.Controls
import QtQuick.Window import QtQuick.Window
import FluentUI import FluentUI
Button { FluControl {
property bool disabled: false 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) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
Button { FluControl {
property bool disabled: false property bool disabled: false
property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

View File

@ -52,7 +52,7 @@ Item{
anchors.fill: parent anchors.fill: parent
} }
Button{ FluControl{
id:btn_start id:btn_start
height: vertical ? 20 : 40 height: vertical ? 20 : 40
width: vertical ? 40 : 20 width: vertical ? 40 : 20
@ -82,7 +82,7 @@ Item{
} }
} }
Button{ FluControl{
id:btn_end id:btn_end
height: vertical ? 20 : 40 height: vertical ? 20 : 40
width: vertical ? 40 : 20 width: vertical ? 40 : 20

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
Button { FluControl {
property int iconSize: 20 property int iconSize: 20
property int iconSource property int iconSource

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
TextArea{ FluTextArea{
property int fontStyle: FluText.Body property int fontStyle: FluText.Body
property int pixelSize : FluTheme.textSize property int pixelSize : FluTheme.textSize

View File

@ -3,8 +3,7 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import FluentUI import FluentUI
FluControl {
Button {
property bool selected: false property bool selected: false
property bool disabled: false property bool disabled: false

View File

@ -114,11 +114,9 @@ ScrollBar {
anchors.fill: parent anchors.fill: parent
onEntered: { onEntered: {
timer.restart() timer.restart()
console.debug("onEntered")
} }
onExited: { onExited: {
timer.restart() timer.restart()
console.debug("onExited")
} }
} }
} }

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
TextField{ FluTextFiled{
property int fontStyle: FluText.Body property int fontStyle: FluText.Body
property int pixelSize : FluTheme.textSize property int pixelSize : FluTheme.textSize

View File

@ -2,7 +2,7 @@
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
Button { FluControl {
property bool disabled: false property bool disabled: false
property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

View File

@ -1,9 +1,9 @@
import QtQuick 2.0 import QtQuick
import QtQuick.Controls 2.0 import QtQuick.Controls
import FluentUI import FluentUI
import QtQuick.Layouts import QtQuick.Layouts
Button { FluControl {
property bool selected: false property bool selected: false
property var clickFunc property var clickFunc

View File

@ -64,5 +64,8 @@
<file>controls/FluFlipView.qml</file> <file>controls/FluFlipView.qml</file>
<file>controls/FluPivot.qml</file> <file>controls/FluPivot.qml</file>
<file>controls/FluPivotItem.qml</file> <file>controls/FluPivotItem.qml</file>
<file>controls/FluControl.qml</file>
<file>controls/FluTextFiled.qml</file>
<file>controls/FluTextArea.qml</file>
</qresource> </qresource>
</RCC> </RCC>