amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-24 19:50:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-03-29 16:23:16 +08:00
parent 5fd934b5f5
commit cb33af8836
119 changed files with 880 additions and 1130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

414
example/example_en_US.ts
View File

File diff suppressed because it is too large Load Diff

414
example/example_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

2
example/qml/App.qml
View File

@ -33,7 +33,7 @@ FluLauncher {
FluApp.windowIcon = "qrc:/example/res/image/favicon.ico" FluApp.windowIcon = "qrc:/example/res/image/favicon.ico"
FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar() FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
FluTheme.darkMode = SettingsHelper.getDarkMode() FluTheme.darkMode = SettingsHelper.getDarkMode()
FluTheme.enableAnimation = true FluTheme.animationEnabled = true
FluRouter.routes = { FluRouter.routes = {
"/":"qrc:/example/qml/window/MainWindow.qml", "/":"qrc:/example/qml/window/MainWindow.qml",
"/about":"qrc:/example/qml/window/AboutWindow.qml", "/about":"qrc:/example/qml/window/AboutWindow.qml",

8
example/qml/chart/T_BarChart.qml
View File

@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Bar Chart") title: qsTr("Bar Chart")
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent
@ -72,7 +72,7 @@ FluScrollablePage{
FluArea{ FluArea{
width: 500 width: 500
height: 370 height: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

6
example/qml/chart/T_BubbleChart.qml
View File

@ -14,9 +14,9 @@ FluScrollablePage{
} }
FluArea{ FluArea{
height: 370 Layout.preferredWidth: 500
width: 500 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

6
example/qml/chart/T_LineChart.qml
View File

@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Line Chart") title: qsTr("Line Chart")
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

12
example/qml/chart/T_PieChart.qml
View File

@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Pie Chart") title: qsTr("Pie Chart")
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent
@ -51,9 +51,9 @@ FluScrollablePage{
} }
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

6
example/qml/chart/T_PolarAreaChart.qml
View File

@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Polar Area Chart") title: qsTr("Polar Area Chart")
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

6
example/qml/chart/T_RadarChart.qml
View File

@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Radar Chart") title: qsTr("Radar Chart")
FluArea{ FluArea{
width: 500 Layout.preferredWidth: 500
height: 370 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent

7
example/qml/chart/T_ScatterChart.qml
View File

@ -14,9 +14,9 @@ FluScrollablePage{
} }
FluArea{ FluArea{
height: 370 Layout.preferredWidth: 500
width: 500 Layout.preferredHeight: 370
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluChart{ FluChart{
anchors.fill: parent anchors.fill: parent
@ -119,5 +119,4 @@ FluScrollablePage{
} }
} }
} }
} }

4
example/qml/global/ItemsOriginal.qml
View File

@ -473,10 +473,12 @@ FluObject{
} }
FluPaneItem{ FluPaneItem{
title: qsTr("Test Crash") title: qsTr("Test Crash")
visible: FluTools.isWin()
onTapListener: function(){ onTapListener: function(){
AppInfo.testCrash() AppInfo.testCrash()
} }
Component.onCompleted: {
visible = FluTools.isWin()
}
} }
} }

7
example/qml/page/T_Acrylic.qml
View File

@ -11,7 +11,6 @@ FluScrollablePage{
RowLayout{ RowLayout{
spacing: 10 spacing: 10
Layout.topMargin: 20
FluText{ FluText{
text:"tintColor:" text:"tintColor:"
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
@ -44,8 +43,8 @@ FluScrollablePage{
} }
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 1200/4+20 Layout.preferredHeight: 1200/4+20
paddings: 10 padding: 10
Layout.topMargin: 10 Layout.topMargin: 10
FluClip{ FluClip{
width: 1920/4 width: 1920/4
@ -95,7 +94,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'Image{ code:'Image{
id:image id:image
width: 800 width: 800

1
example/qml/page/T_Awesome.qml
View File

@ -12,7 +12,6 @@ FluContentPage {
id:text_box id:text_box
placeholderText: qsTr("Please enter a keyword") placeholderText: qsTr("Please enter a keyword")
anchors{ anchors{
topMargin: 20
top:parent.top top:parent.top
} }
} }

5
example/qml/page/T_Badge.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20
height: 120 height: 120
paddings: 10 padding: 10
Column{ Column{
spacing: 15 spacing: 15
@ -114,7 +113,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'Rectangle{ code:'Rectangle{
width: 40 width: 40
height: 40 height: 40

11
example/qml/page/T_BreadcrumbBar.qml
View File

@ -20,9 +20,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20
FluBreadcrumbBar{ FluBreadcrumbBar{
id:breadcrumb_1 id:breadcrumb_1
@ -38,8 +37,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
ColumnLayout{ ColumnLayout{
@ -77,7 +76,7 @@ FluScrollablePage{
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluBreadcrumbBar{ code:'FluBreadcrumbBar{
width:parent.width width:parent.width
separator:">" separator:">"

57
example/qml/page/T_Buttons.qml
View File

@ -10,15 +10,14 @@ FluScrollablePage{
title: qsTr("Buttons") title: qsTr("Buttons")
FluText{ FluText{
Layout.topMargin: 20
text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events") text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events")
} }
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 Layout.topMargin: 10
Layout.topMargin: 20 padding: 10
FluTextButton{ FluTextButton{
disabled: text_button_switch.checked disabled: text_button_switch.checked
@ -42,7 +41,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTextButton{ code:'FluTextButton{
text:"Text Button" text:"Text Button"
onClicked: { onClicked: {
@ -53,8 +52,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluButton{ FluButton{
@ -79,7 +78,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluButton{ code:'FluButton{
text:"Standard Button" text:"Standard Button"
onClicked: { onClicked: {
@ -90,9 +89,9 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
paddings: 10 padding: 10
FluFilledButton{ FluFilledButton{
disabled: filled_button_switch.checked disabled: filled_button_switch.checked
@ -116,7 +115,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluFilledButton{ code:'FluFilledButton{
text:"Filled Button" text:"Filled Button"
onClicked: { onClicked: {
@ -127,9 +126,9 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
paddings: 10 padding: 10
FluToggleButton{ FluToggleButton{
disabled:toggle_button_switch.checked disabled:toggle_button_switch.checked
@ -150,7 +149,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluToggleButton{ code:'FluToggleButton{
text:"Toggle Button" text:"Toggle Button"
onClicked: { onClicked: {
@ -174,9 +173,9 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
paddings: 10 padding: 10
FluProgressButton{ FluProgressButton{
id: btn_progress id: btn_progress
@ -202,7 +201,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluProgressButton{ code:'FluProgressButton{
text:"Progress Button" text:"Progress Button"
onClicked: { onClicked: {
@ -213,9 +212,9 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
paddings: 10 padding: 10
FluLoadingButton{ FluLoadingButton{
id: btn_loading id: btn_loading
@ -241,7 +240,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluLoadingButton{ code:'FluLoadingButton{
text:"Loading Button" text:"Loading Button"
onClicked: { onClicked: {
@ -253,8 +252,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: layout_icon_button.height + 30 Layout.preferredHeight: layout_icon_button.height + 30
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
Flow{ Flow{
id: layout_icon_button id: layout_icon_button
@ -323,7 +322,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluIconButton{ code:'FluIconButton{
iconSource:FluentIcons.ChromeCloseContrast iconSource:FluentIcons.ChromeCloseContrast
onClicked: { onClicked: {
@ -334,8 +333,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluDropDownButton{ FluDropDownButton{
disabled: drop_down_button_switch.checked disabled: drop_down_button_switch.checked
@ -371,7 +370,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluDropDownButton{ code:'FluDropDownButton{
text:"DropDownButton" text:"DropDownButton"
FluMenuItem{ FluMenuItem{
@ -391,8 +390,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluRadioButtons{ FluRadioButtons{
spacing: 8 spacing: 8
@ -424,7 +423,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluRadioButton{ code:'FluRadioButton{
checked:true checked:true
text:"Text Button" text:"Text Button"

7
example/qml/page/T_CalendarPicker.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 80
height: 80 padding: 10
paddings: 10
ColumnLayout{ ColumnLayout{
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -28,7 +27,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluCalendarPicker{ code:'FluCalendarPicker{
}' }'

1
example/qml/page/T_Captcha.qml
View File

@ -11,7 +11,6 @@ FluScrollablePage{
FluCaptcha{ FluCaptcha{
id: captcha id: captcha
Layout.topMargin: 20
ignoreCase:switch_case.checked ignoreCase:switch_case.checked
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent

7
example/qml/page/T_Carousel.qml
View File

@ -25,8 +25,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 370 height: 370
paddings: 10 padding: 10
Layout.topMargin: 20
Column{ Column{
spacing: 15 spacing: 15
anchors{ anchors{
@ -65,7 +64,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 340 height: 340
paddings: 10 padding: 10
Layout.topMargin: 10 Layout.topMargin: 10
Column{ Column{
spacing: 15 spacing: 15
@ -126,7 +125,7 @@ FluScrollablePage{
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluCarousel{ code:'FluCarousel{
id:carousel id:carousel
width: 400 width: 400

13
example/qml/page/T_CheckBox.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 72 Layout.preferredHeight: 72
paddings: 10 padding: 10
Layout.topMargin: 20
FluText{ FluText{
text: qsTr("A 2-state CheckBox") text: qsTr("A 2-state CheckBox")
@ -49,7 +48,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluCheckBox{ code:'FluCheckBox{
text:"Text" text:"Text"
}' }'
@ -57,8 +56,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 72 Layout.preferredHeight: 72
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluText{ FluText{
@ -104,7 +103,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluCheckBox{ code:'FluCheckBox{
text:"Text" text:"Text"
indeterminate:true indeterminate:true

7
example/qml/page/T_Clip.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 380
height: 380 padding: 10
paddings: 10
Column{ Column{
spacing: 15 spacing: 15
@ -88,7 +87,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluClip{ code:'FluClip{
radius: [25,25,25,25] radius: [25,25,25,25]
width: 50 width: 50

7
example/qml/page/T_ColorPicker.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 60
height: 60 padding: 10
paddings: 10
RowLayout{ RowLayout{
FluText{ FluText{
text: qsTr("Click to Select a Color - >") text: qsTr("Click to Select a Color - >")
@ -33,7 +32,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluColorPicker{ code:'FluColorPicker{
}' }'

13
example/qml/page/T_ComboBox.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 80 Layout.preferredHeight: 80
paddings: 5 padding: 5
Layout.topMargin: 20
Column{ Column{
spacing: 5 spacing: 5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -34,8 +33,8 @@ FluScrollablePage{
FluArea { FluArea {
Layout.fillWidth: true Layout.fillWidth: true
height: 80 Layout.preferredHeight: 80
paddings: 5 padding: 5
Layout.topMargin: 20 Layout.topMargin: 20
Column{ Column{
spacing: 5 spacing: 5
@ -59,7 +58,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 80 height: 80
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
Column{ Column{
spacing: 5 spacing: 5
@ -85,7 +84,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluComboBox{ code:'FluComboBox{
editable: true editable: true
model: ListModel { model: ListModel {

13
example/qml/page/T_DatePicker.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 80
height: 80 padding: 10
paddings: 10
ColumnLayout{ ColumnLayout{
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -32,7 +31,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluDatePicker{ code:'FluDatePicker{
}' }'
@ -41,8 +40,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 80 Layout.preferredHeight: 80
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -61,7 +60,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluDatePicker{ code:'FluDatePicker{
showYear:false showYear:false
}' }'

19
example/qml/page/T_Dialog.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20
FluButton{ FluButton{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: qsTr("Show Double Button Dialog") text: qsTr("Show Double Button Dialog")
@ -24,7 +23,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluContentDialog{ code:'FluContentDialog{
id:dialog id:dialog
title: qsTr("Friendly Reminder") title: qsTr("Friendly Reminder")
@ -59,8 +58,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluButton{ FluButton{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -72,7 +71,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluContentDialog{ code:'FluContentDialog{
id: dialog id: dialog
title: qsTr("Friendly Reminder") title: qsTr("Friendly Reminder")
@ -116,8 +115,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluButton{ FluButton{
anchors.top: parent.top anchors.top: parent.top
@ -138,7 +137,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluContentDialog{ code:'FluContentDialog{
id: dialog id: dialog
title: qsTr("Friendly Reminder") title: qsTr("Friendly Reminder")

5
example/qml/page/T_Expander.qml
View File

@ -12,8 +12,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: layout_column.height+20 height: layout_column.height+20
paddings: 10 padding: 10
Layout.topMargin: 20
Column{ Column{
id:layout_column id:layout_column
spacing: 15 spacing: 15
@ -83,7 +82,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluExpander{ code:'FluExpander{
headerText: qsTr("Open a radio box") headerText: qsTr("Open a radio box")
Item{ Item{

11
example/qml/page/T_FlipView.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 340 Layout.preferredHeight: 340
paddings: 10 padding: 10
Layout.topMargin: 20
ColumnLayout{ ColumnLayout{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
FluText{ FluText{
@ -40,7 +39,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluFlipView{ code:'FluFlipView{
Image{ Image{
source: "qrc:/example/res/image/banner_1.jpg" source: "qrc:/example/res/image/banner_1.jpg"
@ -64,7 +63,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 340 height: 340
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
ColumnLayout{ ColumnLayout{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -93,7 +92,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluFlipView{ code:'FluFlipView{
vertical:true vertical:true
Image{ Image{

3
example/qml/page/T_Home.qml
View File

@ -9,7 +9,8 @@ import "../global"
FluScrollablePage{ FluScrollablePage{
launchMode: FluPageType.SingleTask launchMode: FluPageType.SingleTask
animDisabled: true animationEnabled: false
header: Item{}
FluentInitalizrWindow{ FluentInitalizrWindow{
id:fluent_initalizr id:fluent_initalizr

7
example/qml/page/T_Image.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 260 Layout.preferredHeight: 260
paddings: 10 padding: 10
Layout.topMargin: 20
Column{ Column{
spacing: 15 spacing: 15
anchors{ anchors{
@ -37,7 +36,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluImage{ code:'FluImage{
width: 400 width: 400
height: 300 height: 300

7
example/qml/page/T_InfoBar.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 270
height: 270 padding: 10
paddings: 10
ColumnLayout{ ColumnLayout{
spacing: 14 spacing: 14
anchors{ anchors{
@ -60,7 +59,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'showInfo(qsTr("This is an InfoBar in the Info Style")) code:'showInfo(qsTr("This is an InfoBar in the Info Style"))
showWarning(qsTr("This is an InfoBar in the Warning Style")) showWarning(qsTr("This is an InfoBar in the Warning Style"))

13
example/qml/page/T_Menu.qml
View File

@ -49,9 +49,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20
Column{ Column{
id: layout_column id: layout_column
spacing: 15 spacing: 15
@ -78,7 +77,7 @@ FluScrollablePage{
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluMenu{ code:'FluMenu{
id:menu id:menu
FluMenuItem:{ FluMenuItem:{
@ -101,8 +100,8 @@ menu.popup()
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
Column{ Column{
spacing: 15 spacing: 15
@ -151,7 +150,7 @@ menu.popup()
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluMenuBar{ code:'FluMenuBar{
id:menu id:menu
FluMenu:{ FluMenu:{

27
example/qml/page/T_MultiWindow.qml
View File

@ -23,9 +23,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 86 Layout.preferredHeight: 86
paddings: 10 padding: 10
Layout.topMargin: 20
Column{ Column{
spacing: 15 spacing: 15
anchors{ anchors{
@ -46,8 +45,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 86 Layout.preferredHeight: 86
paddings: 10 padding: 10
Layout.topMargin: 10 Layout.topMargin: 10
Column{ Column{
spacing: 15 spacing: 15
@ -70,8 +69,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 86 Layout.preferredHeight: 86
paddings: 10 padding: 10
Layout.topMargin: 10 Layout.topMargin: 10
Column{ Column{
spacing: 15 spacing: 15
@ -92,7 +91,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluWindow{ code:'FluWindow{
//launchMode: FluWindowType.Standard //launchMode: FluWindowType.Standard
//launchMode: FluWindowType.SingleTask //launchMode: FluWindowType.SingleTask
@ -104,8 +103,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
Column{ Column{
spacing: 15 spacing: 15
@ -126,7 +125,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluButton{ code:'FluButton{
text: qsTr("Create Window") text: qsTr("Create Window")
onClicked: { onClicked: {
@ -138,8 +137,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 130 Layout.preferredHeight: 130
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
Column{ Column{
@ -164,7 +163,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluWindowResultLauncher{ code:'FluWindowResultLauncher{
id:loginResultLauncher id:loginResultLauncher
path: "/login" path: "/login"

1
example/qml/page/T_Network.qml
View File

@ -40,7 +40,6 @@ FluContentPage{
clip: true clip: true
anchors{ anchors{
top: parent.top top: parent.top
topMargin: 20
bottom: parent.bottom bottom: parent.bottom
left: parent.left left: parent.left
} }

7
example/qml/page/T_Pagination.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 200 Layout.preferredHeight: 200
paddings: 10 padding: 10
Layout.topMargin: 20
ColumnLayout{ ColumnLayout{
spacing: 20 spacing: 20
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -37,7 +36,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluPagination{ code:'FluPagination{
pageCurrent: 1 pageCurrent: 1
itemCount: 1000 itemCount: 1000

9
example/qml/page/T_Pivot.qml
View File

@ -11,11 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 400
height: 400 padding: 10
paddings: 10
FluPivot{ FluPivot{
anchors.fill: parent anchors.fill: parent
@ -49,7 +46,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluPivot{ code:'FluPivot{
anchors.fill: parent anchors.fill: parent
FluPivotItem:{ FluPivotItem:{

13
example/qml/page/T_Progress.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 130
height: 130 padding: 10
paddings: 10
ColumnLayout{ ColumnLayout{
spacing: 10 spacing: 10
@ -32,7 +31,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluProgressBar{ code:'FluProgressBar{
} }
@ -45,8 +44,8 @@ FluProgressRing{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 286 Layout.preferredHeight: 286
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 10 spacing: 10
@ -88,7 +87,7 @@ FluProgressRing{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluProgressBar{ code:'FluProgressBar{
indeterminate: false indeterminate: false
} }

1
example/qml/page/T_QRCode.qml
View File

@ -11,7 +11,6 @@ FluScrollablePage{
FluQRCode{ FluQRCode{
id:qrcode id:qrcode
Layout.topMargin: 20
size:slider_size.value size:slider_size.value
text:text_box.text text:text_box.text
color:color_picker.current color:color_picker.current

13
example/qml/page/T_RadioButton.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20
Row{ Row{
spacing: 30 spacing: 30
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -41,7 +40,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluRadioButton{ code:'FluRadioButton{
text:"Text" text:"Text"
}' }'
@ -49,8 +48,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluRadioButtons{ FluRadioButtons{
spacing: 8 spacing: 8
@ -83,7 +82,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluRadioButtons{ code:'FluRadioButtons{
spacing: 8 spacing: 8
FluRadioButton{ FluRadioButton{

7
example/qml/page/T_RatingControl.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage {
FluArea { FluArea {
Layout.fillWidth: true Layout.fillWidth: true
height: 100 Layout.preferredHeight: 100
paddings: 10 padding: 10
Layout.topMargin: 20
Column { Column {
spacing: 10 spacing: 10
@ -27,7 +26,7 @@ FluScrollablePage {
CodeExpander { CodeExpander {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code: 'FluRatingControl{ code: 'FluRatingControl{
}' }'

7
example/qml/page/T_Rectangle.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 80
height: 80 padding: 10
paddings: 10
Column{ Column{
spacing: 15 spacing: 15
@ -64,7 +63,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluRectangle{ code:'FluRectangle{
radius: [25,25,25,25] radius: [25,25,25,25]
width: 50 width: 50

14
example/qml/page/T_Settings.qml
View File

@ -20,8 +20,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 60 Layout.preferredHeight: 60
paddings: 10 padding: 10
Row{ Row{
spacing: 20 spacing: 20
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -46,7 +46,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 50 height: 50
paddings: 10 padding: 10
FluCheckBox{ FluCheckBox{
text: qsTr("Use System AppBar") text: qsTr("Use System AppBar")
checked: FluApp.useSystemAppBar checked: FluApp.useSystemAppBar
@ -62,7 +62,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 50 height: 50
paddings: 10 padding: 10
FluCheckBox{ FluCheckBox{
text:qsTr("Fits AppBar Windows") text:qsTr("Fits AppBar Windows")
checked: window.fitsAppBarWindows checked: window.fitsAppBarWindows
@ -89,7 +89,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 128 height: 128
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 5 spacing: 5
@ -119,7 +119,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 160 height: 160
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 5 spacing: 5
@ -159,7 +159,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 80 height: 80
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 10 spacing: 10

7
example/qml/page/T_ShortcutPicker.qml
View File

@ -11,16 +11,15 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 100
height: 100 padding: 10
paddings: 10
FluShortcutPicker{ FluShortcutPicker{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluShortcutPicker{ code:'FluShortcutPicker{
}' }'

9
example/qml/page/T_Slider.qml
View File

@ -12,8 +12,7 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 200 Layout.preferredHeight: 200
Layout.topMargin: 20 padding: 10
paddings: 10
Row{ Row{
spacing: 30 spacing: 30
@ -27,7 +26,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluSlider{ code:'FluSlider{
value:50 value:50
}' }'
@ -38,7 +37,7 @@ FluScrollablePage{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 200 Layout.preferredHeight: 200
Layout.topMargin: 20 Layout.topMargin: 20
paddings: 10 padding: 10
Row{ Row{
spacing: 30 spacing: 30
FluRangeSlider{ FluRangeSlider{
@ -51,7 +50,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluRangeSlider{ code:'FluRangeSlider{
orientation: Qt.Vertical orientation: Qt.Vertical
}' }'

1
example/qml/page/T_SplitLayout.qml
View File

@ -13,7 +13,6 @@ FluContentPage{
id:layout_dropdown id:layout_dropdown
anchors{ anchors{
top: parent.top top: parent.top
topMargin: 20
} }
FluText{ FluText{
text:"orientation:" text:"orientation:"

1
example/qml/page/T_StaggeredLayout.qml
View File

@ -27,7 +27,6 @@ FluContentPage{
Flickable{ Flickable{
id: scroll id: scroll
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 20
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
contentHeight: staggered_view.implicitHeight contentHeight: staggered_view.implicitHeight
clip: true clip: true

11
example/qml/page/T_StatusLayout.qml
View File

@ -12,9 +12,8 @@ FluScrollablePage{
FluArea{ FluArea{
id:layout_actions id:layout_actions
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 50
height: 50 padding: 10
paddings: 10
RowLayout{ RowLayout{
spacing: 14 spacing: 14
FluDropDownButton{ FluDropDownButton{
@ -56,8 +55,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 10 Layout.topMargin: 10
height: 380 Layout.preferredHeight: 380
paddings: 10 padding: 10
FluStatusLayout{ FluStatusLayout{
id:status_view id:status_view
anchors.fill: parent anchors.fill: parent
@ -76,7 +75,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluStatusLayout{ code:'FluStatusLayout{
anchors.fill: parent anchors.fill: parent
statusMode: FluStatusLayoutType.Loading statusMode: FluStatusLayoutType.Loading

11
example/qml/page/T_TabView.qml
View File

@ -31,9 +31,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 50
height: 50 padding: 10
paddings: 10
RowLayout{ RowLayout{
spacing: 14 spacing: 14
FluDropDownButton{ FluDropDownButton{
@ -94,8 +93,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 15 Layout.topMargin: 15
height: 400 Layout.preferredHeight: 400
paddings: 10 padding: 10
FluTabView{ FluTabView{
id:tab_view id:tab_view
onNewPressed:{ onNewPressed:{
@ -105,7 +104,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTabView{ code:'FluTabView{
anchors.fill: parent anchors.fill: parent
Component.onCompleted: { Component.onCompleted: {

4
example/qml/page/T_TableView.qml
View File

@ -159,7 +159,7 @@ FluContentPage{
FluCheckBox{ FluCheckBox{
anchors.centerIn: parent anchors.centerIn: parent
checked: true === options.checked checked: true === options.checked
enableAnimation: false animationEnabled: false
clickListener: function(){ clickListener: function(){
var obj = table_view.getRow(row) var obj = table_view.getRow(row)
obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked}) obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked})
@ -239,7 +239,7 @@ FluContentPage{
} }
FluCheckBox{ FluCheckBox{
checked: true === root.seletedAll checked: true === root.seletedAll
enableAnimation: false animationEnabled: false
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
clickListener: function(){ clickListener: function(){
root.seletedAll = !root.seletedAll root.seletedAll = !root.seletedAll

7
example/qml/page/T_Text.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 60
height: 60 padding: 10
paddings: 10
FluCopyableText{ FluCopyableText{
text: qsTr("This is a text that can be copied") text: qsTr("This is a text that can be copied")
@ -23,7 +22,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluCopyableText{ code:'FluCopyableText{
text: qsTr("This is a text that can be copied") text: qsTr("This is a text that can be copied")
}' }'

31
example/qml/page/T_TextBox.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20
FluTextBox{ FluTextBox{
placeholderText: qsTr("Single-line Input Box") placeholderText: qsTr("Single-line Input Box")
@ -36,7 +35,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTextBox{ code:'FluTextBox{
placeholderText: qsTr("Single-line Input Box") placeholderText: qsTr("Single-line Input Box")
}' }'
@ -44,8 +43,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluPasswordBox{ FluPasswordBox{
@ -67,7 +66,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluPasswordBox{ code:'FluPasswordBox{
placeholderText: qsTr("Please enter your password") placeholderText: qsTr("Please enter your password")
}' }'
@ -75,8 +74,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 36+multiine_textbox.height Layout.preferredHeight: 36+multiine_textbox.height
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluMultilineTextBox{ FluMultilineTextBox{
@ -100,7 +99,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluMultilineTextBox{ code:'FluMultilineTextBox{
placeholderText: qsTr("Multi-line Input Box") placeholderText: qsTr("Multi-line Input Box")
}' }'
@ -108,8 +107,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluAutoSuggestBox{ FluAutoSuggestBox{
placeholderText: qsTr("AutoSuggestBox") placeholderText: qsTr("AutoSuggestBox")
@ -131,7 +130,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluAutoSuggestBox{ code:'FluAutoSuggestBox{
placeholderText: qsTr("AutoSuggestBox") placeholderText: qsTr("AutoSuggestBox")
}' }'
@ -139,8 +138,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20 Layout.topMargin: 20
FluSpinBox{ FluSpinBox{
disabled: spin_box_switch.checked disabled: spin_box_switch.checked
@ -160,7 +159,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluSpinBox{ code:'FluSpinBox{
}' }'

9
example/qml/page/T_Theme.qml
View File

@ -13,9 +13,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20
Layout.preferredHeight: 340 Layout.preferredHeight: 340
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing:0 spacing:0
@ -115,16 +114,16 @@ FluScrollablePage{
} }
FluToggleSwitch{ FluToggleSwitch{
Layout.topMargin: 5 Layout.topMargin: 5
checked: FluTheme.enableAnimation checked: FluTheme.animationEnabled
onClicked: { onClicked: {
FluTheme.enableAnimation = !FluTheme.enableAnimation FluTheme.animationEnabled = !FluTheme.animationEnabled
} }
} }
} }
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTheme.accentColor = FluColors.Orange code:'FluTheme.accentColor = FluColors.Orange
FluTheme.dark = true FluTheme.dark = true

13
example/qml/page/T_TimePicker.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
launchMode: FluPageType.SingleInstance launchMode: FluPageType.SingleInstance
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.preferredHeight: 80
height: 80 padding: 10
paddings: 10
ColumnLayout{ ColumnLayout{
@ -43,7 +42,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTimePicker{ code:'FluTimePicker{
}' }'
@ -52,8 +51,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 80 Layout.preferredHeight: 80
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
@ -83,7 +82,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTimePicker{ code:'FluTimePicker{
hourFormat:FluTimePickerType.HH hourFormat:FluTimePickerType.HH
}' }'

1
example/qml/page/T_Timeline.qml
View File

@ -106,7 +106,6 @@ FluScrollablePage{
RowLayout{ RowLayout{
spacing: 20 spacing: 20
Layout.topMargin: 20
FluTextBox{ FluTextBox{
id: text_box id: text_box
text: "Technical testing 2015-09-01" text: "Technical testing 2015-09-01"

7
example/qml/page/T_ToggleSwitch.qml
View File

@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Layout.topMargin: 20
Row{ Row{
spacing: 30 spacing: 30
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -41,7 +40,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluToggleSwitch{ code:'FluToggleSwitch{
text:"Text" text:"Text"
}' }'

13
example/qml/page/T_Tooltip.qml
View File

@ -10,15 +10,14 @@ FluScrollablePage{
title: qsTr("Tooltip") title: qsTr("Tooltip")
FluText{ FluText{
Layout.topMargin: 20
text: qsTr("Hover over Tultip and it pops up") text: qsTr("Hover over Tultip and it pops up")
} }
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Column{ Column{
spacing: 5 spacing: 5
@ -41,7 +40,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluIconButton{ code:'FluIconButton{
iconSource:FluentIcons.ChromeCloseContrast iconSource:FluentIcons.ChromeCloseContrast
iconSize: 15 iconSize: 15
@ -56,8 +55,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 68 Layout.preferredHeight: 68
paddings: 10 padding: 10
Column{ Column{
spacing: 5 spacing: 5
@ -84,7 +83,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluButton{ code:'FluButton{
id: button_1 id: button_1
text: qsTr("Delete") text: qsTr("Delete")

7
example/qml/page/T_Tour.qml
View File

@ -20,9 +20,8 @@ FluScrollablePage{
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
height: 130 Layout.preferredHeight: 130
paddings: 10 padding: 10
Layout.topMargin: 20
FluFilledButton{ FluFilledButton{
anchors{ anchors{
@ -66,7 +65,7 @@ FluScrollablePage{
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -1 Layout.topMargin: -6
code:'FluTour{ code:'FluTour{
id:tour id:tour
steps:[ steps:[

1
example/qml/page/T_TreeView.qml
View File

@ -33,7 +33,6 @@ FluContentPage {
spacing: 12 spacing: 12
width: 300 width: 300
anchors{ anchors{
topMargin: 20
top:parent.top top:parent.top
left: parent.left left: parent.left
leftMargin: 10 leftMargin: 10

3
example/qml/page/T_Typography.qml
View File

@ -16,9 +16,8 @@ FluContentPage {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
topMargin: 20
} }
paddings: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 0 spacing: 0
scale: textScale scale: textScale

1
example/qml/page/T_Watermark.qml
View File

@ -11,7 +11,6 @@ FluContentPage{
FluArea{ FluArea{
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 20
ColumnLayout{ ColumnLayout{
anchors{ anchors{

2
example/qml/window/MainWindow.qml
View File

@ -253,7 +253,7 @@ FluWindow {
} }
function handleDarkChanged(button){ function handleDarkChanged(button){
if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){ if(!FluTheme.animationEnabled || window.fitsAppBarWindows === false){
changeDark() changeDark()
}else{ }else{
if(loader_reveal.sourceComponent){ if(loader_reveal.sourceComponent){

2
src/FluTheme.cpp
View File

@ -14,7 +14,7 @@ FluTheme::FluTheme(QObject *parent):QObject{parent}{
accentColor(FluColors::getInstance()->Blue()); accentColor(FluColors::getInstance()->Blue());
darkMode(FluThemeType::DarkMode::Light); darkMode(FluThemeType::DarkMode::Light);
nativeText(false); nativeText(false);
enableAnimation(true); animationEnabled(true);
_systemDark = systemDark(); _systemDark = systemDark();
qApp->installEventFilter(this); qApp->installEventFilter(this);
} }

2
src/FluTheme.h
View File

@ -32,7 +32,7 @@ class FluTheme : public QObject
Q_PROPERTY_AUTO(QColor,itemCheckColor); Q_PROPERTY_AUTO(QColor,itemCheckColor);
Q_PROPERTY_AUTO(int,darkMode); Q_PROPERTY_AUTO(int,darkMode);
Q_PROPERTY_AUTO(bool,nativeText); Q_PROPERTY_AUTO(bool,nativeText);
Q_PROPERTY_AUTO(bool,enableAnimation); Q_PROPERTY_AUTO(bool,animationEnabled);
QML_NAMED_ELEMENT(FluTheme) QML_NAMED_ELEMENT(FluTheme)
QML_SINGLETON QML_SINGLETON
private: private:

39
src/Qt5/imports/FluentUI/Controls/FluArea.qml
View File

@ -1,28 +1,23 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Controls.impl 2.15
import QtQuick.Templates 2.15 as T
import FluentUI 1.0 import FluentUI 1.0
Rectangle { T.Frame {
default property alias contentData : layout_content.data property alias border: d.border
property int paddings : 0 property alias color: d.color
property int leftPadding : 0 property alias radius: d.radius
property int rightPadding : 0 id: control
property int topPadding : 0 implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
property int bottomPadding : 0 contentWidth + leftPadding + rightPadding)
id:control implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
radius: 4 contentHeight + topPadding + bottomPadding)
color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) padding: 0
border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) background: Rectangle {
border.width: 1 id:d
implicitHeight: height radius: 4
implicitWidth: width border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
Item { color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
id: layout_content
anchors.fill: parent
anchors.leftMargin: Math.max(paddings,leftPadding)
anchors.rightMargin: Math.max(paddings,rightPadding)
anchors.topMargin: Math.max(paddings,topPadding)
anchors.bottomMargin: Math.max(paddings,bottomPadding)
} }
} }

2
src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml
View File

@ -56,7 +56,7 @@ FluTextBox{
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
contentItem: FluRectangle{ contentItem: FluRectangle{

4
src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml
View File

@ -33,7 +33,7 @@ Item {
properties: "opacity" properties: "opacity"
from: 1 from: 1
to: 0 to: 0
duration: FluTheme.enableAnimation ? 83 : 1 duration: FluTheme.animationEnabled ? 83 : 1
} }
} }
add: Transition { add: Transition {
@ -41,7 +41,7 @@ Item {
properties: "opacity" properties: "opacity"
from: 0 from: 0
to: 1 to: 1
duration: FluTheme.enableAnimation ? 83 : 1 duration: FluTheme.animationEnabled ? 83 : 1
} }
} }
delegate: Item{ delegate: Item{

8
src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
View File

@ -63,7 +63,7 @@ FluButton {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -71,7 +71,7 @@ FluButton {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
contentItem: Item{ contentItem: Item{
@ -163,7 +163,7 @@ FluButton {
OpacityAnimator{ OpacityAnimator{
from: 0 from: 0
to: 1 to: 1
duration: 88 duration: 83
} }
ScaleAnimator{ ScaleAnimator{
from: 0.5 from: 0.5
@ -176,7 +176,7 @@ FluButton {
OpacityAnimator{ OpacityAnimator{
from: 1 from: 1
to: 0 to: 0
duration: 88 duration: 83
} }
ScaleAnimator{ ScaleAnimator{
from: 1.0 from: 1.0

8
src/Qt5/imports/FluentUI/Controls/FluCheckBox.qml
View File

@ -22,7 +22,7 @@ Button {
property alias textColor: btn_text.textColor property alias textColor: btn_text.textColor
property bool textRight: true property bool textRight: true
property real textSpacing: 6 property real textSpacing: 6
property bool enableAnimation: FluTheme.enableAnimation property bool animationEnabled: FluTheme.animationEnabled
property var clickListener : function(){ property var clickListener : function(){
checked = !checked checked = !checked
} }
@ -94,7 +94,7 @@ Button {
return normalColor return normalColor
} }
Behavior on color { Behavior on color {
enabled: control.enableAnimation enabled: control.animationEnabled
ColorAnimation{ ColorAnimation{
duration: 83 duration: 83
} }
@ -107,7 +107,7 @@ Button {
visible: indeterminate visible: indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible { Behavior on visible {
enabled: control.enableAnimation enabled: control.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }
@ -121,7 +121,7 @@ Button {
visible: checked && !indeterminate visible: checked && !indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible { Behavior on visible {
enabled: control.enableAnimation enabled: control.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }

4
src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -120,7 +120,7 @@ T.ComboBox {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -128,7 +128,7 @@ T.ComboBox {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
background:Rectangle{ background:Rectangle{

52
src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
View File

@ -5,56 +5,4 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
FluPage { FluPage {
property alias title: text_title.text
default property alias content: container.data
property int leftPadding: 10
property int topPadding: 0
property int rightPadding: 10
property int bottomPadding: 10
property alias color: status_view.color
property alias statusMode: status_view.statusMode
property alias loadingText: status_view.loadingText
property alias emptyText:status_view.emptyText
property alias errorText:status_view.errorText
property alias errorButtonText:status_view.errorButtonText
property alias loadingItem :status_view.loadingItem
property alias emptyItem : status_view.emptyItem
property alias errorItem :status_view.errorItem
signal errorClicked
id:control
FluText{
id:text_title
visible: text !== ""
height: visible ? contentHeight : 0
font: FluTextStyle.Title
anchors{
top: parent.top
topMargin: control.topPadding
left: parent.left
right: parent.right
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
}
FluStatusLayout{
id:status_view
color: "#00000000"
statusMode: FluStatusLayoutType.Success
onErrorClicked: control.errorClicked()
anchors{
left: parent.left
right: parent.right
top: text_title.bottom
bottom: parent.bottom
leftMargin: control.leftPadding
rightMargin: control.rightPadding
bottomMargin: control.bottomPadding
}
Item{
clip: true
id:container
anchors.fill: parent
}
}
} }

4
src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
View File

@ -105,7 +105,7 @@ FluButton {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -113,7 +113,7 @@ FluButton {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
background:Item{ background:Item{

6
src/Qt5/imports/FluentUI/Controls/FluExpander.qml
View File

@ -64,7 +64,7 @@ Item {
iconSource:FluentIcons.ChevronUp iconSource:FluentIcons.ChevronUp
iconSize: 15 iconSize: 15
Behavior on rotation { Behavior on rotation {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -115,7 +115,7 @@ Item {
to:"expand" to:"expand"
NumberAnimation { NumberAnimation {
properties: "anchors.topMargin" properties: "anchors.topMargin"
duration: FluTheme.enableAnimation && d.flag ? 167 : 0 duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
}, },
@ -123,7 +123,7 @@ Item {
to:"collapsed" to:"collapsed"
NumberAnimation { NumberAnimation {
properties: "anchors.topMargin" properties: "anchors.topMargin"
duration: FluTheme.enableAnimation && d.flag ? 167 : 0 duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }

4
src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -54,7 +54,7 @@ FluObject {
NumberAnimation { NumberAnimation {
properties: "y" properties: "y"
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
duration: FluTheme.enableAnimation ? 333 : 0 duration: FluTheme.animationEnabled ? 333 : 0
} }
} }
onChildrenChanged: if(children.length === 0) destroy(); onChildrenChanged: if(children.length === 0) destroy();
@ -95,7 +95,7 @@ FluObject {
scale: item ? 1 : 0; scale: item ? 1 : 0;
asynchronous: true asynchronous: true
Behavior on scale { Behavior on scale {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation { NumberAnimation {
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
duration: 167 duration: 167

2
src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml
View File

@ -23,7 +23,7 @@ FluButton {
visible: Number(width)!==0 visible: Number(width)!==0
clip: true clip: true
Behavior on width { Behavior on width {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

6
src/Qt5/imports/FluentUI/Controls/FluMenu.qml
View File

@ -5,7 +5,7 @@ import QtQuick.Templates 2.15 as T
import FluentUI 1.0 import FluentUI 1.0
T.Menu { T.Menu {
property bool enableAnimation: true property bool animationEnabled: true
id: control id: control
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
contentWidth + leftPadding + rightPadding) contentWidth + leftPadding + rightPadding)
@ -20,7 +20,7 @@ T.Menu {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -28,7 +28,7 @@ T.Menu {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
} }
} }
contentItem: ListView { contentItem: ListView {

28
src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
View File

@ -167,7 +167,7 @@ Item {
return control.cellHeight return control.cellHeight
} }
Behavior on height { Behavior on height {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }
@ -310,7 +310,7 @@ Item {
return true return true
} }
Behavior on rotation { Behavior on rotation {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -457,7 +457,7 @@ Item {
id:com_panel_item id:com_panel_item
Item{ Item{
Behavior on height { Behavior on height {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -771,13 +771,13 @@ Item {
visible: opacity visible: opacity
opacity: d.isMinimal opacity: d.isMinimal
Behavior on opacity{ Behavior on opacity{
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }
} }
Behavior on Layout.preferredWidth { Behavior on Layout.preferredWidth {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -880,7 +880,7 @@ Item {
} }
} }
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -925,14 +925,14 @@ Item {
} }
x: visible ? 0 : -width x: visible ? 0 : -width
Behavior on width { Behavior on width {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }
Behavior on x { Behavior on x {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -1012,7 +1012,7 @@ Item {
interactive: false interactive: false
model:d.handleItems() model:d.handleItems()
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0 highlightMoveDuration: FluTheme.animationEnabled && d.animDisabled ? 167 : 0
highlight: Item{ highlight: Item{
clip: true clip: true
Rectangle{ Rectangle{
@ -1231,10 +1231,14 @@ Item {
} }
} }
function setCurrentIndex(index){ function setCurrentIndex(index){
nav_list.currentIndex = index
var item = nav_list.model[index] var item = nav_list.model[index]
if(item instanceof FluPaneItem){ if(item.url){
item.tap() nav_list.currentIndex = index
if(item instanceof FluPaneItem){
item.tap()
}
}else{
item.onTapListener()
} }
} }
function getItems(){ function getItems(){

38
src/Qt5/imports/FluentUI/Controls/FluPage.qml
View File

@ -4,31 +4,45 @@ import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
Item { Page {
property int launchMode: FluPageType.SingleTop property int launchMode: FluPageType.SingleTop
property bool animDisabled: false property bool animationEnabled: FluTheme.animationEnabled
property string url : "" property string url : ""
id: control id: control
opacity: visible
visible: false
StackView.onRemoved: destroy() StackView.onRemoved: destroy()
Behavior on opacity{ padding: 5
enabled: !animDisabled && FluTheme.enableAnimation visible: false
NumberAnimation{ opacity: visible
duration: 167
}
}
transform: Translate { transform: Translate {
y: control.visible ? 0 : 80 y: control.visible ? 0 : 80
Behavior on y{ Behavior on y{
enabled: !animDisabled && FluTheme.enableAnimation enabled: control.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }
} }
Behavior on opacity {
enabled: control.animationEnabled
NumberAnimation{
duration: 83
}
}
background: Item{}
header: Item{
implicitHeight: 40
FluText{
id:text_title
text: control.title
font: FluTextStyle.Title
anchors{
left: parent.left
leftMargin: 5
}
}
}
Component.onCompleted: { Component.onCompleted: {
visible = true control.visible = true
} }
} }

4
src/Qt5/imports/FluentUI/Controls/FluPivot.qml
View File

@ -30,7 +30,7 @@ Page {
spacing: control.headerSpacing spacing: control.headerSpacing
interactive: false interactive: false
orientation: ListView.Horizontal orientation: ListView.Horizontal
highlightMoveDuration: FluTheme.enableAnimation ? 167 : 0 highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
highlight: Item{ highlight: Item{
clip: true clip: true
Rectangle{ Rectangle{
@ -40,7 +40,7 @@ Page {
width: nav_list.currentItem ? nav_list.currentItem.width : 0 width: nav_list.currentItem ? nav_list.currentItem.width : 0
y:d.tabY y:d.tabY
Behavior on width { Behavior on width {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

4
src/Qt5/imports/FluentUI/Controls/FluPopup.qml
View File

@ -15,7 +15,7 @@ Popup {
enter: Transition { enter: Transition {
NumberAnimation { NumberAnimation {
property: "opacity" property: "opacity"
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
from:0 from:0
to:1 to:1
} }
@ -24,7 +24,7 @@ Popup {
exit:Transition { exit:Transition {
NumberAnimation { NumberAnimation {
property: "opacity" property: "opacity"
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
from:1 from:1
to:0 to:0
} }

5
src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
ProgressBar{ ProgressBar{
property int duration: 888
property real strokeWidth: 6 property real strokeWidth: 6
property bool progressVisible: false property bool progressVisible: false
property color color: FluTheme.primaryColor property color color: FluTheme.primaryColor
@ -17,7 +18,7 @@ ProgressBar{
if(!indeterminate){ if(!indeterminate){
animator_x.duration = 0 animator_x.duration = 0
rect_progress.x = 0 rect_progress.x = 0
animator_x.duration = 888 animator_x.duration = control.duration
} }
} }
background: Rectangle { background: Rectangle {
@ -46,7 +47,7 @@ ProgressBar{
from: -rect_progress.width from: -rect_progress.width
to:control.width+rect_progress.width to:control.width+rect_progress.width
loops: Animation.Infinite loops: Animation.Infinite
duration: 888 duration: control.duration
} }
} }
} }

4
src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml
View File

@ -73,10 +73,10 @@ Button {
enabled: control.progress !== 0 enabled: control.progress !== 0
SequentialAnimation { SequentialAnimation {
PauseAnimation { PauseAnimation {
duration: FluTheme.enableAnimation ? 167 : 0 duration: FluTheme.animationEnabled ? 167 : 0
} }
NumberAnimation{ NumberAnimation{
duration: FluTheme.enableAnimation ? 167 : 0 duration: FluTheme.animationEnabled ? 167 : 0
from: 3 from: 3
to: background.height to: background.height
} }

2
src/Qt5/imports/FluentUI/Controls/FluRadioButton.qml
View File

@ -66,7 +66,7 @@ Button {
return checked ? 4 : 1 return checked ? 4 : 1
} }
Behavior on border.width { Behavior on border.width {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

77
src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
View File

@ -5,75 +5,16 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
FluPage { FluPage {
property alias title: text_title.text
default property alias content: container.data default property alias content: container.data
property int spacing : 0 Flickable{
property int leftPadding: 10 clip: true
property int topPadding: 0 anchors.fill: parent
property int rightPadding: 10 ScrollBar.vertical: FluScrollBar {}
property int bottomPadding: 10 boundsBehavior: Flickable.StopAtBounds
property alias color: status_view.color contentHeight: container.height
property alias statusMode: status_view.statusMode ColumnLayout{
property alias loadingText: status_view.loadingText id:container
property alias emptyText:status_view.emptyText width: parent.width
property alias errorText:status_view.errorText
property alias errorButtonText:status_view.errorButtonText
property alias loadingItem :status_view.loadingItem
property alias emptyItem : status_view.emptyItem
property alias errorItem :status_view.errorItem
signal errorClicked
id:control
FluText{
id:text_title
font: FluTextStyle.Title
visible: text !== ""
height: visible ? contentHeight : 0
padding: 0
anchors{
top: parent.top
topMargin: control.topPadding
left: parent.left
right: parent.right
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
}
FluStatusLayout{
id:status_view
color: "#00000000"
statusMode: FluStatusLayoutType.Success
onErrorClicked: control.errorClicked()
anchors{
left: parent.left
right: parent.right
top: text_title.bottom
bottom: parent.bottom
bottomMargin: control.bottomPadding
}
Flickable{
id:flickview
clip: true
anchors.fill: parent
contentWidth: parent.width
contentHeight: container.height
ScrollBar.vertical: FluScrollBar {
anchors.right: flickview.right
anchors.rightMargin: 2
}
boundsBehavior: Flickable.StopAtBounds
ColumnLayout{
id:container
spacing: control.spacing
clip: true
anchors{
left: parent.left
right: parent.right
top: parent.top
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
width: parent.width
}
} }
} }
} }

2
src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml
View File

@ -62,7 +62,7 @@ T.SpinBox {
} }
} }
Behavior on height{ Behavior on height{
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

6
src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
View File

@ -43,7 +43,7 @@ Item{
Component{ Component{
id:com_loading id:com_loading
FluArea{ FluArea{
paddings: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
color:control.color color:control.color
@ -63,7 +63,7 @@ Item{
Component { Component {
id:com_empty id:com_empty
FluArea{ FluArea{
paddings: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
color:control.color color:control.color
@ -80,7 +80,7 @@ Item{
Component{ Component{
id:com_error id:com_error
FluArea{ FluArea{
paddings: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
color:control.color color:control.color

2
src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml
View File

@ -46,7 +46,7 @@ FluClip{
} }
} }
Behavior on height{ Behavior on height{
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

2
src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml
View File

@ -9,7 +9,7 @@ FluMenu{
property string selectAllText : qsTr("Select All") property string selectAllText : qsTr("Select All")
property var inputItem property var inputItem
id:menu id:menu
enableAnimation: false animationEnabled: false
width: 120 width: 120
focus: false focus: false
onVisibleChanged: { onVisibleChanged: {

4
src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
View File

@ -121,7 +121,7 @@ FluButton {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -129,7 +129,7 @@ FluButton {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
background:Item{ background:Item{

2
src/Qt5/imports/FluentUI/Controls/FluToggleSwitch.qml
View File

@ -102,7 +102,7 @@ Button {
} }
} }
Behavior on x { Behavior on x {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation { NumberAnimation {
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic

6
src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
View File

@ -51,7 +51,7 @@ Item {
} }
NumberAnimation { NumberAnimation {
properties: "opacity" properties: "opacity"
duration: 88 duration: 83
from: 0 from: 0
to: 1 to: 1
} }
@ -70,7 +70,7 @@ Item {
} }
NumberAnimation { NumberAnimation {
properties: "opacity" properties: "opacity"
duration: 88 duration: 83
from: 0 from: 0
to: 1 to: 1
} }
@ -373,7 +373,7 @@ Item {
horizontalPadding:0 horizontalPadding:0
verticalPadding: 0 verticalPadding: 0
checked: itemModel.checked checked: itemModel.checked
enableAnimation:false animationEnabled:false
visible: control.checkable visible: control.checkable
padding: 0 padding: 0
clickListener: function(){ clickListener: function(){

2
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -142,7 +142,7 @@ Window {
Behavior on opacity { Behavior on opacity {
SequentialAnimation { SequentialAnimation {
PauseAnimation { PauseAnimation {
duration: 88 duration: 83
} }
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167

40
src/Qt6/imports/FluentUI/Controls/FluArea.qml
View File

@ -1,28 +1,22 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls.impl
import QtQuick.Window import QtQuick.Templates as T
import FluentUI import FluentUI
Rectangle { T.Frame {
default property alias contentData : layout_content.data property alias border: d.border
property int paddings : 0 property alias color: d.color
property int leftPadding : 0 property alias radius: d.radius
property int rightPadding : 0 id: control
property int topPadding : 0 implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
property int bottomPadding : 0 contentWidth + leftPadding + rightPadding)
id:control implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
radius: 4 contentHeight + topPadding + bottomPadding)
color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) padding: 0
border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) background: Rectangle {
border.width: 1 id:d
implicitHeight: height radius: 4
implicitWidth: width border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
Item { color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
id: layout_content
anchors.fill: parent
anchors.leftMargin: Math.max(paddings,leftPadding)
anchors.rightMargin: Math.max(paddings,rightPadding)
anchors.topMargin: Math.max(paddings,topPadding)
anchors.bottomMargin: Math.max(paddings,bottomPadding)
} }
} }

2
src/Qt6/imports/FluentUI/Controls/FluAutoSuggestBox.qml
View File

@ -55,7 +55,7 @@ FluTextBox{
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
contentItem: FluRectangle{ contentItem: FluRectangle{

4
src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml
View File

@ -33,7 +33,7 @@ Item {
properties: "opacity" properties: "opacity"
from: 1 from: 1
to: 0 to: 0
duration: FluTheme.enableAnimation ? 83 : 1 duration: FluTheme.animationEnabled ? 83 : 1
} }
} }
add: Transition { add: Transition {
@ -41,7 +41,7 @@ Item {
properties: "opacity" properties: "opacity"
from: 0 from: 0
to: 1 to: 1
duration: FluTheme.enableAnimation ? 83 : 1 duration: FluTheme.animationEnabled ? 83 : 1
} }
} }
delegate: Item{ delegate: Item{

8
src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
View File

@ -62,7 +62,7 @@ FluButton {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -70,7 +70,7 @@ FluButton {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
contentItem: Item{ contentItem: Item{
@ -162,7 +162,7 @@ FluButton {
OpacityAnimator{ OpacityAnimator{
from: 0 from: 0
to: 1 to: 1
duration: 88 duration: 83
} }
ScaleAnimator{ ScaleAnimator{
from: 0.5 from: 0.5
@ -175,7 +175,7 @@ FluButton {
OpacityAnimator{ OpacityAnimator{
from: 1 from: 1
to: 0 to: 0
duration: 88 duration: 83
} }
ScaleAnimator{ ScaleAnimator{
from: 1.0 from: 1.0

8
src/Qt6/imports/FluentUI/Controls/FluCheckBox.qml
View File

@ -23,7 +23,7 @@ Button {
property alias textColor: btn_text.textColor property alias textColor: btn_text.textColor
property bool textRight: true property bool textRight: true
property real textSpacing: 6 property real textSpacing: 6
property bool enableAnimation: FluTheme.enableAnimation property bool animationEnabled: FluTheme.animationEnabled
property var clickListener : function(){ property var clickListener : function(){
checked = !checked checked = !checked
} }
@ -95,7 +95,7 @@ Button {
return normalColor return normalColor
} }
Behavior on color { Behavior on color {
enabled: control.enableAnimation enabled: control.animationEnabled
ColorAnimation{ ColorAnimation{
duration: 83 duration: 83
} }
@ -108,7 +108,7 @@ Button {
visible: indeterminate visible: indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible { Behavior on visible {
enabled: control.enableAnimation enabled: control.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }
@ -122,7 +122,7 @@ Button {
visible: checked && !indeterminate visible: checked && !indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible { Behavior on visible {
enabled: control.enableAnimation enabled: control.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 83 duration: 83
} }

4
src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -120,7 +120,7 @@ T.ComboBox {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -128,7 +128,7 @@ T.ComboBox {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
background:Rectangle{ background:Rectangle{

52
src/Qt6/imports/FluentUI/Controls/FluContentPage.qml
View File

@ -5,56 +5,4 @@ import QtQuick.Controls
import FluentUI import FluentUI
FluPage { FluPage {
property alias title: text_title.text
default property alias content: container.data
property int leftPadding: 10
property int topPadding: 0
property int rightPadding: 10
property int bottomPadding: 10
property alias color: status_view.color
property alias statusMode: status_view.statusMode
property alias loadingText: status_view.loadingText
property alias emptyText:status_view.emptyText
property alias errorText:status_view.errorText
property alias errorButtonText:status_view.errorButtonText
property alias loadingItem :status_view.loadingItem
property alias emptyItem : status_view.emptyItem
property alias errorItem :status_view.errorItem
signal errorClicked
id:control
FluText{
id:text_title
visible: text !== ""
height: visible ? contentHeight : 0
font: FluTextStyle.Title
anchors{
top: parent.top
topMargin: control.topPadding
left: parent.left
right: parent.right
leftMargin: control.leftPadding
rightMargin: control.rightPadding
}
}
FluStatusLayout{
id:status_view
color: "#00000000"
statusMode: FluStatusLayoutType.Success
onErrorClicked: control.errorClicked()
anchors{
left: parent.left
right: parent.right
top: text_title.bottom
bottom: parent.bottom
leftMargin: control.leftPadding
rightMargin: control.rightPadding
bottomMargin: control.bottomPadding
}
Item{
clip: true
id:container
anchors.fill: parent
}
}
} }

4
src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
View File

@ -104,7 +104,7 @@ FluButton {
property: "opacity" property: "opacity"
from:0 from:0
to:1 to:1
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
exit:Transition { exit:Transition {
@ -112,7 +112,7 @@ FluButton {
property: "opacity" property: "opacity"
from:1 from:1
to:0 to:0
duration: FluTheme.enableAnimation ? 83 : 0 duration: FluTheme.animationEnabled ? 83 : 0
} }
} }
background:Item{ background:Item{

6
src/Qt6/imports/FluentUI/Controls/FluExpander.qml
View File

@ -64,7 +64,7 @@ Item {
iconSource:FluentIcons.ChevronUp iconSource:FluentIcons.ChevronUp
iconSize: 15 iconSize: 15
Behavior on rotation { Behavior on rotation {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation{ NumberAnimation{
duration: 167 duration: 167
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
@ -115,7 +115,7 @@ Item {
to:"expand" to:"expand"
NumberAnimation { NumberAnimation {
properties: "anchors.topMargin" properties: "anchors.topMargin"
duration: FluTheme.enableAnimation && d.flag ? 167 : 0 duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
}, },
@ -123,7 +123,7 @@ Item {
to:"collapsed" to:"collapsed"
NumberAnimation { NumberAnimation {
properties: "anchors.topMargin" properties: "anchors.topMargin"
duration: FluTheme.enableAnimation && d.flag ? 167 : 0 duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }

4
src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -54,7 +54,7 @@ FluObject {
NumberAnimation { NumberAnimation {
properties: "y" properties: "y"
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
duration: FluTheme.enableAnimation ? 333 : 0 duration: FluTheme.animationEnabled ? 333 : 0
} }
} }
onChildrenChanged: if(children.length === 0) destroy(); onChildrenChanged: if(children.length === 0) destroy();
@ -95,7 +95,7 @@ FluObject {
scale: item ? 1 : 0; scale: item ? 1 : 0;
asynchronous: true asynchronous: true
Behavior on scale { Behavior on scale {
enabled: FluTheme.enableAnimation enabled: FluTheme.animationEnabled
NumberAnimation { NumberAnimation {
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
duration: 167 duration: 167

Some files were not shown because too many files have changed in this diff Show More