diff --git a/example/example_en_US.ts b/example/example_en_US.ts
index 203cc1f2..be4a9df1 100644
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@@ -771,12 +771,12 @@ Updated content:
-
+
-
+
@@ -789,7 +789,7 @@ Updated content:
-
+
@@ -810,7 +810,7 @@ Updated content:
-
+
@@ -831,149 +831,149 @@ Updated content:
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -994,27 +994,27 @@ Updated content:
-
+
-
+
-
+
-
+
-
+
@@ -1027,7 +1027,7 @@ Updated content:
-
+
@@ -1040,33 +1040,33 @@ Updated content:
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -1079,7 +1079,7 @@ Updated content:
-
+
@@ -1092,47 +1092,47 @@ Updated content:
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1154,12 +1154,12 @@ Updated content:
-
+
-
+
@@ -1172,93 +1172,93 @@ Updated content:
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1271,17 +1271,17 @@ Updated content:
-
+
-
+
-
+
-
+
-
+
@@ -1314,22 +1314,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
T_Home
-
+
-
+
-
+
-
+
@@ -1342,7 +1342,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
@@ -1355,43 +1355,43 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1408,37 +1408,37 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
T_Menu
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1451,7 +1451,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
@@ -1462,59 +1462,59 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1527,41 +1527,41 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -1598,42 +1598,42 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1678,33 +1678,33 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -1871,22 +1871,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
+
-
+
@@ -2016,7 +2016,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
@@ -2029,31 +2029,31 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
@@ -2066,27 +2066,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
+
-
+
-
+
@@ -2099,48 +2099,48 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
@@ -2153,12 +2153,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
@@ -2171,17 +2171,17 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
+
@@ -2194,33 +2194,33 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -2239,8 +2239,8 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
-
+
+
@@ -2260,18 +2260,18 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
-
+
+
-
+
@@ -2289,12 +2289,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
-
+
diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
index eec79e2f..30b9f385 100644
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@@ -775,12 +775,12 @@ Updated content:
请输入关键字
-
+
搜索
-
+
您复制
@@ -793,7 +793,7 @@ Updated content:
徽章
-
+
一般出现在通知图标或头像的右上角,用于显示需要处理的消息条数
@@ -814,7 +814,7 @@ Updated content:
面包屑
-
+
重置
@@ -835,149 +835,149 @@ Updated content:
按钮
-
+
支持Tab键切换焦点,空格键执行点击事件
-
+
文本按钮
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
禁用
-
+
标准按钮
-
+
点击标准按钮
-
+
填充按钮
-
+
点击填充按钮
-
+
开关按钮
-
+
进度按钮
-
+
加载按钮
-
+
正在加载
-
+
点击图标按钮
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
下拉按钮
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -998,27 +998,27 @@ Updated content:
验证码
-
+
刷新
-
+
忽略大小写
-
+
请输入验证码
-
+
验证码错误
-
+
错误验证,请重新输入
@@ -1031,7 +1031,7 @@ Updated content:
轮播图
-
+
轮播图,支持无限轮播,无限滑动,用ListView实现的组件
@@ -1044,33 +1044,33 @@ Updated content:
复选框
-
+
-
+
右
-
+
左
-
-
+
+
禁用
-
+
-
+
@@ -1083,7 +1083,7 @@ Updated content:
裁剪
-
+
配合图片使用(software渲染下该组件将没有效果)
@@ -1096,47 +1096,47 @@ Updated content:
颜色选择器
-
+
点击选中颜色 - >
-
+
取消
-
+
确定
-
+
颜色选择器
-
+
编辑颜色
-
+
红色
-
+
绿色
-
+
蓝色
-
+
透明度
@@ -1157,7 +1157,7 @@ Updated content:
日期选择器
-
+
@@ -1182,7 +1182,7 @@ Updated content:
确定
-
+
@@ -1195,93 +1195,93 @@ Updated content:
弹窗
-
+
显示双按钮对话框
-
-
-
+
+
+
友情提示
-
-
+
+
您确定要退出吗?
-
-
+
+
取消
-
-
-
+
+
+
单击取消按钮
-
-
-
-
+
+
+
+
确定
-
-
-
+
+
+
单击确定按钮
-
+
显示三个按钮对话框
-
+
最小化
-
+
单击最小化
-
+
自定义对话框内容
-
+
自定义对话框内容2
-
+
正在加载,请稍等...
-
+
取消加载
-
+
测试InfoBar层级在Popup之上
-
+
线型图
@@ -1294,17 +1294,17 @@ Updated content:
展开
-
+
打开一个单选框
-
+
打开一个滑动文本框
-
+
-
+
水平方向的翻转视图
-
+
垂直方向的翻转视图
@@ -1345,22 +1345,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
T_Home
-
+
FluentUI GitHub
-
+
最新的 FluentUI 控件和样式
-
+
FluentUI脚手架
-
+
FluentUI 脚手架是一个快速创建项目工具,可帮助您创建和自定义具有各种选项的 Fluent UI 项目
@@ -1377,7 +1377,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
重新加载
-
+
图片加载失败,请重新加载
@@ -1390,43 +1390,43 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
信息栏
-
+
-
-
+
+
这是一个Info样式的信息栏
-
+
-
+
这是一个Warning样式的信息栏
-
+
这是一个Error样式的信息栏
-
+
这是一个Success样式的信息栏
-
+
需要手动关闭的信息栏
-
+
支持手动关闭
@@ -1447,37 +1447,37 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
T_Menu
-
+
菜单
-
+
文件
-
+
新建...
-
+
打开...
-
+
保存
-
+
退出
@@ -1490,7 +1490,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
不可操作
@@ -1501,59 +1501,59 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
+
另存为...
-
+
DOC
-
+
PDF
-
+
打开菜单弹框
-
+
菜单栏
-
+
编辑
-
+
剪切
-
+
复制
-
+
粘贴
-
+
帮助
-
+
关于
@@ -1566,41 +1566,41 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
多窗口
-
+
<font color='red'>Standard</font> 模式窗口,每次都会创建新窗口
-
-
-
-
-
+
+
+
+
+
创建窗口
-
+
<font color='red'>SingleTask</font> 模式窗口,如果窗口存在,这激活该窗口
-
+
<font color='red'>SingleInstance</font> 模式窗口,如果窗口存在,则销毁窗口,然后新建窗口
-
+
创建一个窗口,不携带任何参数
-
+
创建一个窗口,并携带参数用户名:zhuzichu
-
+
登录窗口返回过来的密码 - >
@@ -1646,42 +1646,42 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
轴转
-
+
所有
-
+
所有电子邮件都在这里
-
+
未读
-
+
未读电子邮件都在这里
-
+
标记
-
+
标记电子邮件都在这里
-
+
紧急
-
+
紧急电子邮件都在这里
@@ -1727,33 +1727,33 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
单选按钮
-
+
右
-
+
左
-
-
+
+
禁用
-
+
-
+
-
+
@@ -1940,22 +1940,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
状态布局
-
+
正在加载...
-
+
空空如也
-
+
页面出错了...
-
+
重新加载
@@ -2085,7 +2085,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
文本
-
+
这是一个可以复制的文本
@@ -2098,31 +2098,31 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
文本框
-
+
单行输入框
-
-
-
-
-
+
+
+
+
+
禁用
-
+
请输入您的密码
-
+
多行输入框
-
+
自动建议框
@@ -2135,27 +2135,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
主题
-
+
主题颜色
-
+
自定义主题颜色
-
+
夜间模式
-
+
Native文本
-
+
开启动画
@@ -2168,48 +2168,48 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
时间选择器
-
+
-
-
+
+
上午
-
-
+
+
下午
-
-
+
+
时
-
-
+
+
分
-
-
+
+
取消
-
-
+
+
确定
-
+
@@ -2222,12 +2222,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
时间轴
-
+
追加
-
+
清空
@@ -2240,17 +2240,17 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
切换开关
-
+
右
-
+
左
-
+
禁用
@@ -2263,33 +2263,33 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
工具提示
-
+
鼠标悬停不动,弹出Tooltip
-
+
FluIconButton的text属性自带Tooltip效果
-
-
+
+
删除
-
+
点击图标按钮
-
+
给一个Button添加Tooltip效果
-
+
点击按钮
@@ -2320,8 +2320,8 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
-
-
+
+
保存
@@ -2341,18 +2341,18 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
点击查看其他操作
-
+
开始游览
-
-
+
+
上传
-
+
更多
@@ -2370,12 +2370,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
树
-
+
共计%1条数据,当前显示的%2条数据
-
+
共计选中%1条数据
diff --git a/example/qml/App.qml b/example/qml/App.qml
index 1eb53f6a..6d33206d 100644
--- a/example/qml/App.qml
+++ b/example/qml/App.qml
@@ -33,7 +33,7 @@ FluLauncher {
FluApp.windowIcon = "qrc:/example/res/image/favicon.ico"
FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
FluTheme.darkMode = SettingsHelper.getDarkMode()
- FluTheme.enableAnimation = true
+ FluTheme.animationEnabled = true
FluRouter.routes = {
"/":"qrc:/example/qml/window/MainWindow.qml",
"/about":"qrc:/example/qml/window/AboutWindow.qml",
diff --git a/example/qml/chart/T_BarChart.qml b/example/qml/chart/T_BarChart.qml
index 95e70464..f05525d0 100644
--- a/example/qml/chart/T_BarChart.qml
+++ b/example/qml/chart/T_BarChart.qml
@@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Bar Chart")
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
@@ -72,7 +72,7 @@ FluScrollablePage{
FluArea{
width: 500
height: 370
- paddings: 10
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_BubbleChart.qml b/example/qml/chart/T_BubbleChart.qml
index 9574042e..4d76b647 100644
--- a/example/qml/chart/T_BubbleChart.qml
+++ b/example/qml/chart/T_BubbleChart.qml
@@ -14,9 +14,9 @@ FluScrollablePage{
}
FluArea{
- height: 370
- width: 500
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_LineChart.qml b/example/qml/chart/T_LineChart.qml
index 59e47f55..2c6f1fe7 100644
--- a/example/qml/chart/T_LineChart.qml
+++ b/example/qml/chart/T_LineChart.qml
@@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Line Chart")
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_PieChart.qml b/example/qml/chart/T_PieChart.qml
index a51e7475..cea752f9 100644
--- a/example/qml/chart/T_PieChart.qml
+++ b/example/qml/chart/T_PieChart.qml
@@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Pie Chart")
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
@@ -51,9 +51,9 @@ FluScrollablePage{
}
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_PolarAreaChart.qml b/example/qml/chart/T_PolarAreaChart.qml
index 080237e1..af711a04 100644
--- a/example/qml/chart/T_PolarAreaChart.qml
+++ b/example/qml/chart/T_PolarAreaChart.qml
@@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Polar Area Chart")
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_RadarChart.qml b/example/qml/chart/T_RadarChart.qml
index 041f2554..c870e4fa 100644
--- a/example/qml/chart/T_RadarChart.qml
+++ b/example/qml/chart/T_RadarChart.qml
@@ -10,9 +10,9 @@ FluScrollablePage{
title: qsTr("Radar Chart")
FluArea{
- width: 500
- height: 370
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
diff --git a/example/qml/chart/T_ScatterChart.qml b/example/qml/chart/T_ScatterChart.qml
index eea50219..12dd0918 100644
--- a/example/qml/chart/T_ScatterChart.qml
+++ b/example/qml/chart/T_ScatterChart.qml
@@ -14,9 +14,9 @@ FluScrollablePage{
}
FluArea{
- height: 370
- width: 500
- paddings: 10
+ Layout.preferredWidth: 500
+ Layout.preferredHeight: 370
+ padding: 10
Layout.topMargin: 20
FluChart{
anchors.fill: parent
@@ -119,5 +119,4 @@ FluScrollablePage{
}
}
}
-
}
diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml
index 6c63cc20..224d35a1 100644
--- a/example/qml/global/ItemsOriginal.qml
+++ b/example/qml/global/ItemsOriginal.qml
@@ -473,10 +473,12 @@ FluObject{
}
FluPaneItem{
title: qsTr("Test Crash")
- visible: FluTools.isWin()
onTapListener: function(){
AppInfo.testCrash()
}
+ Component.onCompleted: {
+ visible = FluTools.isWin()
+ }
}
}
diff --git a/example/qml/page/T_Acrylic.qml b/example/qml/page/T_Acrylic.qml
index 4e037f23..66b2e03b 100644
--- a/example/qml/page/T_Acrylic.qml
+++ b/example/qml/page/T_Acrylic.qml
@@ -11,7 +11,6 @@ FluScrollablePage{
RowLayout{
spacing: 10
- Layout.topMargin: 20
FluText{
text:"tintColor:"
Layout.alignment: Qt.AlignVCenter
@@ -44,8 +43,8 @@ FluScrollablePage{
}
FluArea{
Layout.fillWidth: true
- height: 1200/4+20
- paddings: 10
+ Layout.preferredHeight: 1200/4+20
+ padding: 10
Layout.topMargin: 10
FluClip{
width: 1920/4
@@ -95,7 +94,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'Image{
id:image
width: 800
diff --git a/example/qml/page/T_Awesome.qml b/example/qml/page/T_Awesome.qml
index e203ba2f..ef192196 100644
--- a/example/qml/page/T_Awesome.qml
+++ b/example/qml/page/T_Awesome.qml
@@ -12,7 +12,6 @@ FluContentPage {
id:text_box
placeholderText: qsTr("Please enter a keyword")
anchors{
- topMargin: 20
top:parent.top
}
}
diff --git a/example/qml/page/T_Badge.qml b/example/qml/page/T_Badge.qml
index a0ac3d2b..868d6a33 100644
--- a/example/qml/page/T_Badge.qml
+++ b/example/qml/page/T_Badge.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
height: 120
- paddings: 10
+ padding: 10
Column{
spacing: 15
@@ -114,7 +113,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'Rectangle{
width: 40
height: 40
diff --git a/example/qml/page/T_BreadcrumbBar.qml b/example/qml/page/T_BreadcrumbBar.qml
index 947ea127..9a20f767 100644
--- a/example/qml/page/T_BreadcrumbBar.qml
+++ b/example/qml/page/T_BreadcrumbBar.qml
@@ -20,9 +20,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ padding: 10
FluBreadcrumbBar{
id:breadcrumb_1
@@ -38,8 +37,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
ColumnLayout{
@@ -77,7 +76,7 @@ FluScrollablePage{
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluBreadcrumbBar{
width:parent.width
separator:">"
diff --git a/example/qml/page/T_Buttons.qml b/example/qml/page/T_Buttons.qml
index 4c049ca3..e760e866 100644
--- a/example/qml/page/T_Buttons.qml
+++ b/example/qml/page/T_Buttons.qml
@@ -10,15 +10,14 @@ FluScrollablePage{
title: qsTr("Buttons")
FluText{
- Layout.topMargin: 20
text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events")
}
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ Layout.topMargin: 10
+ padding: 10
FluTextButton{
disabled: text_button_switch.checked
@@ -42,7 +41,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTextButton{
text:"Text Button"
onClicked: {
@@ -53,8 +52,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluButton{
@@ -79,7 +78,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluButton{
text:"Standard Button"
onClicked: {
@@ -90,9 +89,9 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
+ Layout.preferredHeight: 68
Layout.topMargin: 20
- paddings: 10
+ padding: 10
FluFilledButton{
disabled: filled_button_switch.checked
@@ -116,7 +115,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluFilledButton{
text:"Filled Button"
onClicked: {
@@ -127,9 +126,9 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
+ Layout.preferredHeight: 68
Layout.topMargin: 20
- paddings: 10
+ padding: 10
FluToggleButton{
disabled:toggle_button_switch.checked
@@ -150,7 +149,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluToggleButton{
text:"Toggle Button"
onClicked: {
@@ -174,9 +173,9 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
+ Layout.preferredHeight: 68
Layout.topMargin: 20
- paddings: 10
+ padding: 10
FluProgressButton{
id: btn_progress
@@ -202,7 +201,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluProgressButton{
text:"Progress Button"
onClicked: {
@@ -213,9 +212,9 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
+ Layout.preferredHeight: 68
Layout.topMargin: 20
- paddings: 10
+ padding: 10
FluLoadingButton{
id: btn_loading
@@ -241,7 +240,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluLoadingButton{
text:"Loading Button"
onClicked: {
@@ -253,8 +252,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: layout_icon_button.height + 30
- paddings: 10
+ Layout.preferredHeight: layout_icon_button.height + 30
+ padding: 10
Layout.topMargin: 20
Flow{
id: layout_icon_button
@@ -323,7 +322,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluIconButton{
iconSource:FluentIcons.ChromeCloseContrast
onClicked: {
@@ -334,8 +333,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluDropDownButton{
disabled: drop_down_button_switch.checked
@@ -371,7 +370,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluDropDownButton{
text:"DropDownButton"
FluMenuItem{
@@ -391,8 +390,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
FluRadioButtons{
spacing: 8
@@ -424,7 +423,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluRadioButton{
checked:true
text:"Text Button"
diff --git a/example/qml/page/T_CalendarPicker.qml b/example/qml/page/T_CalendarPicker.qml
index 29497473..2dd9e22d 100644
--- a/example/qml/page/T_CalendarPicker.qml
+++ b/example/qml/page/T_CalendarPicker.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
ColumnLayout{
anchors{
verticalCenter: parent.verticalCenter
@@ -28,7 +27,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluCalendarPicker{
}'
diff --git a/example/qml/page/T_Captcha.qml b/example/qml/page/T_Captcha.qml
index 2c520bc9..6054b21e 100644
--- a/example/qml/page/T_Captcha.qml
+++ b/example/qml/page/T_Captcha.qml
@@ -11,7 +11,6 @@ FluScrollablePage{
FluCaptcha{
id: captcha
- Layout.topMargin: 20
ignoreCase:switch_case.checked
MouseArea{
anchors.fill: parent
diff --git a/example/qml/page/T_Carousel.qml b/example/qml/page/T_Carousel.qml
index f386085b..012cdb11 100644
--- a/example/qml/page/T_Carousel.qml
+++ b/example/qml/page/T_Carousel.qml
@@ -25,8 +25,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
height: 370
- paddings: 10
- Layout.topMargin: 20
+ padding: 10
Column{
spacing: 15
anchors{
@@ -65,7 +64,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
height: 340
- paddings: 10
+ padding: 10
Layout.topMargin: 10
Column{
spacing: 15
@@ -126,7 +125,7 @@ FluScrollablePage{
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluCarousel{
id:carousel
width: 400
diff --git a/example/qml/page/T_CheckBox.qml b/example/qml/page/T_CheckBox.qml
index 3f6caf65..797a2328 100644
--- a/example/qml/page/T_CheckBox.qml
+++ b/example/qml/page/T_CheckBox.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 72
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 72
+ padding: 10
FluText{
text: qsTr("A 2-state CheckBox")
@@ -49,7 +48,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluCheckBox{
text:"Text"
}'
@@ -57,8 +56,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 72
- paddings: 10
+ Layout.preferredHeight: 72
+ padding: 10
Layout.topMargin: 20
FluText{
@@ -104,7 +103,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluCheckBox{
text:"Text"
indeterminate:true
diff --git a/example/qml/page/T_Clip.qml b/example/qml/page/T_Clip.qml
index 00f2d2e2..f54e33be 100644
--- a/example/qml/page/T_Clip.qml
+++ b/example/qml/page/T_Clip.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 380
- paddings: 10
+ Layout.preferredHeight: 380
+ padding: 10
Column{
spacing: 15
@@ -88,7 +87,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluClip{
radius: [25,25,25,25]
width: 50
diff --git a/example/qml/page/T_ColorPicker.qml b/example/qml/page/T_ColorPicker.qml
index 7cce39c4..49c85977 100644
--- a/example/qml/page/T_ColorPicker.qml
+++ b/example/qml/page/T_ColorPicker.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 60
- paddings: 10
+ Layout.preferredHeight: 60
+ padding: 10
RowLayout{
FluText{
text: qsTr("Click to Select a Color - >")
@@ -33,7 +32,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluColorPicker{
}'
diff --git a/example/qml/page/T_ComboBox.qml b/example/qml/page/T_ComboBox.qml
index 822c60f1..3d568224 100644
--- a/example/qml/page/T_ComboBox.qml
+++ b/example/qml/page/T_ComboBox.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 80
- paddings: 5
- Layout.topMargin: 20
+ Layout.preferredHeight: 80
+ padding: 5
Column{
spacing: 5
anchors.verticalCenter: parent.verticalCenter
@@ -34,8 +33,8 @@ FluScrollablePage{
FluArea {
Layout.fillWidth: true
- height: 80
- paddings: 5
+ Layout.preferredHeight: 80
+ padding: 5
Layout.topMargin: 20
Column{
spacing: 5
@@ -59,7 +58,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
height: 80
- paddings: 10
+ padding: 10
Layout.topMargin: 20
Column{
spacing: 5
@@ -85,7 +84,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluComboBox{
editable: true
model: ListModel {
diff --git a/example/qml/page/T_DatePicker.qml b/example/qml/page/T_DatePicker.qml
index a6474522..e0be770d 100644
--- a/example/qml/page/T_DatePicker.qml
+++ b/example/qml/page/T_DatePicker.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
ColumnLayout{
anchors{
verticalCenter: parent.verticalCenter
@@ -32,7 +31,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluDatePicker{
}'
@@ -41,8 +40,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
ColumnLayout{
anchors{
verticalCenter: parent.verticalCenter
@@ -61,7 +60,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluDatePicker{
showYear:false
}'
diff --git a/example/qml/page/T_Dialog.qml b/example/qml/page/T_Dialog.qml
index 33ffd56d..325a0369 100644
--- a/example/qml/page/T_Dialog.qml
+++ b/example/qml/page/T_Dialog.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ padding: 10
FluButton{
anchors.verticalCenter: parent.verticalCenter
text: qsTr("Show Double Button Dialog")
@@ -24,7 +23,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluContentDialog{
id:dialog
title: qsTr("Friendly Reminder")
@@ -59,8 +58,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluButton{
anchors.verticalCenter: parent.verticalCenter
@@ -72,7 +71,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluContentDialog{
id: dialog
title: qsTr("Friendly Reminder")
@@ -116,8 +115,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
FluButton{
anchors.top: parent.top
@@ -138,7 +137,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluContentDialog{
id: dialog
title: qsTr("Friendly Reminder")
diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml
index ac6c5ded..e1765087 100644
--- a/example/qml/page/T_Expander.qml
+++ b/example/qml/page/T_Expander.qml
@@ -12,8 +12,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
height: layout_column.height+20
- paddings: 10
- Layout.topMargin: 20
+ padding: 10
Column{
id:layout_column
spacing: 15
@@ -83,7 +82,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluExpander{
headerText: qsTr("Open a radio box")
Item{
diff --git a/example/qml/page/T_FlipView.qml b/example/qml/page/T_FlipView.qml
index 26d35350..9d253ebb 100644
--- a/example/qml/page/T_FlipView.qml
+++ b/example/qml/page/T_FlipView.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 340
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 340
+ padding: 10
ColumnLayout{
anchors.verticalCenter: parent.verticalCenter
FluText{
@@ -40,7 +39,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluFlipView{
Image{
source: "qrc:/example/res/image/banner_1.jpg"
@@ -64,7 +63,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
height: 340
- paddings: 10
+ padding: 10
Layout.topMargin: 20
ColumnLayout{
anchors.verticalCenter: parent.verticalCenter
@@ -93,7 +92,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluFlipView{
vertical:true
Image{
diff --git a/example/qml/page/T_Home.qml b/example/qml/page/T_Home.qml
index ba399fea..40a746cf 100644
--- a/example/qml/page/T_Home.qml
+++ b/example/qml/page/T_Home.qml
@@ -9,7 +9,8 @@ import "../global"
FluScrollablePage{
launchMode: FluPageType.SingleTask
- animDisabled: true
+ animationEnabled: false
+ header: Item{}
FluentInitalizrWindow{
id:fluent_initalizr
diff --git a/example/qml/page/T_Image.qml b/example/qml/page/T_Image.qml
index b5662367..fd264081 100644
--- a/example/qml/page/T_Image.qml
+++ b/example/qml/page/T_Image.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 260
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 260
+ padding: 10
Column{
spacing: 15
anchors{
@@ -37,7 +36,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluImage{
width: 400
height: 300
diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml
index bb232a16..a1cf6648 100644
--- a/example/qml/page/T_InfoBar.qml
+++ b/example/qml/page/T_InfoBar.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 270
- paddings: 10
+ Layout.preferredHeight: 270
+ padding: 10
ColumnLayout{
spacing: 14
anchors{
@@ -60,7 +59,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'showInfo(qsTr("This is an InfoBar in the Info Style"))
showWarning(qsTr("This is an InfoBar in the Warning Style"))
diff --git a/example/qml/page/T_Menu.qml b/example/qml/page/T_Menu.qml
index b7c3e32a..06e0aa73 100644
--- a/example/qml/page/T_Menu.qml
+++ b/example/qml/page/T_Menu.qml
@@ -49,9 +49,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 100
+ padding: 10
Column{
id: layout_column
spacing: 15
@@ -78,7 +77,7 @@ FluScrollablePage{
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluMenu{
id:menu
FluMenuItem:{
@@ -101,8 +100,8 @@ menu.popup()
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
Column{
spacing: 15
@@ -151,7 +150,7 @@ menu.popup()
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluMenuBar{
id:menu
FluMenu:{
diff --git a/example/qml/page/T_MultiWindow.qml b/example/qml/page/T_MultiWindow.qml
index f5cabc54..aeb80d7e 100644
--- a/example/qml/page/T_MultiWindow.qml
+++ b/example/qml/page/T_MultiWindow.qml
@@ -23,9 +23,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 86
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 86
+ padding: 10
Column{
spacing: 15
anchors{
@@ -46,8 +45,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 86
- paddings: 10
+ Layout.preferredHeight: 86
+ padding: 10
Layout.topMargin: 10
Column{
spacing: 15
@@ -70,8 +69,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 86
- paddings: 10
+ Layout.preferredHeight: 86
+ padding: 10
Layout.topMargin: 10
Column{
spacing: 15
@@ -92,7 +91,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluWindow{
//launchMode: FluWindowType.Standard
//launchMode: FluWindowType.SingleTask
@@ -104,8 +103,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
Column{
spacing: 15
@@ -126,7 +125,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluButton{
text: qsTr("Create Window")
onClicked: {
@@ -138,8 +137,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 130
- paddings: 10
+ Layout.preferredHeight: 130
+ padding: 10
Layout.topMargin: 20
Column{
@@ -164,7 +163,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluWindowResultLauncher{
id:loginResultLauncher
path: "/login"
diff --git a/example/qml/page/T_Network.qml b/example/qml/page/T_Network.qml
index 3891517c..8757d81d 100644
--- a/example/qml/page/T_Network.qml
+++ b/example/qml/page/T_Network.qml
@@ -40,7 +40,6 @@ FluContentPage{
clip: true
anchors{
top: parent.top
- topMargin: 20
bottom: parent.bottom
left: parent.left
}
diff --git a/example/qml/page/T_Pagination.qml b/example/qml/page/T_Pagination.qml
index 717c3dc1..14e19732 100644
--- a/example/qml/page/T_Pagination.qml
+++ b/example/qml/page/T_Pagination.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 200
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 200
+ padding: 10
ColumnLayout{
spacing: 20
anchors.verticalCenter: parent.verticalCenter
@@ -37,7 +36,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluPagination{
pageCurrent: 1
itemCount: 1000
diff --git a/example/qml/page/T_Pivot.qml b/example/qml/page/T_Pivot.qml
index c2c15c84..0eb68926 100644
--- a/example/qml/page/T_Pivot.qml
+++ b/example/qml/page/T_Pivot.qml
@@ -11,11 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 400
- paddings: 10
-
-
+ Layout.preferredHeight: 400
+ padding: 10
FluPivot{
anchors.fill: parent
@@ -49,7 +46,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluPivot{
anchors.fill: parent
FluPivotItem:{
diff --git a/example/qml/page/T_Progress.qml b/example/qml/page/T_Progress.qml
index bf175b9b..78e55544 100644
--- a/example/qml/page/T_Progress.qml
+++ b/example/qml/page/T_Progress.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 130
- paddings: 10
+ Layout.preferredHeight: 130
+ padding: 10
ColumnLayout{
spacing: 10
@@ -32,7 +31,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluProgressBar{
}
@@ -45,8 +44,8 @@ FluProgressRing{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 286
- paddings: 10
+ Layout.preferredHeight: 286
+ padding: 10
ColumnLayout{
spacing: 10
@@ -88,7 +87,7 @@ FluProgressRing{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluProgressBar{
indeterminate: false
}
diff --git a/example/qml/page/T_QRCode.qml b/example/qml/page/T_QRCode.qml
index 1afff6af..0e257c50 100644
--- a/example/qml/page/T_QRCode.qml
+++ b/example/qml/page/T_QRCode.qml
@@ -11,7 +11,6 @@ FluScrollablePage{
FluQRCode{
id:qrcode
- Layout.topMargin: 20
size:slider_size.value
text:text_box.text
color:color_picker.current
diff --git a/example/qml/page/T_RadioButton.qml b/example/qml/page/T_RadioButton.qml
index 8af2a0fe..55aa9083 100644
--- a/example/qml/page/T_RadioButton.qml
+++ b/example/qml/page/T_RadioButton.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ padding: 10
Row{
spacing: 30
anchors.verticalCenter: parent.verticalCenter
@@ -41,7 +40,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluRadioButton{
text:"Text"
}'
@@ -49,8 +48,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
Layout.topMargin: 20
FluRadioButtons{
spacing: 8
@@ -83,7 +82,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluRadioButtons{
spacing: 8
FluRadioButton{
diff --git a/example/qml/page/T_RatingControl.qml b/example/qml/page/T_RatingControl.qml
index 6ea00725..5175c4ea 100644
--- a/example/qml/page/T_RatingControl.qml
+++ b/example/qml/page/T_RatingControl.qml
@@ -11,9 +11,8 @@ FluScrollablePage {
FluArea {
Layout.fillWidth: true
- height: 100
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 100
+ padding: 10
Column {
spacing: 10
@@ -27,7 +26,7 @@ FluScrollablePage {
CodeExpander {
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code: 'FluRatingControl{
}'
diff --git a/example/qml/page/T_Rectangle.qml b/example/qml/page/T_Rectangle.qml
index f9219c78..0c58967a 100644
--- a/example/qml/page/T_Rectangle.qml
+++ b/example/qml/page/T_Rectangle.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
Column{
spacing: 15
@@ -64,7 +63,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluRectangle{
radius: [25,25,25,25]
width: 50
diff --git a/example/qml/page/T_Settings.qml b/example/qml/page/T_Settings.qml
index 87837b9d..41ecdfa6 100644
--- a/example/qml/page/T_Settings.qml
+++ b/example/qml/page/T_Settings.qml
@@ -20,8 +20,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 60
- paddings: 10
+ Layout.preferredHeight: 60
+ padding: 10
Row{
spacing: 20
anchors.verticalCenter: parent.verticalCenter
@@ -46,7 +46,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.topMargin: 20
height: 50
- paddings: 10
+ padding: 10
FluCheckBox{
text: qsTr("Use System AppBar")
checked: FluApp.useSystemAppBar
@@ -62,7 +62,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.topMargin: 20
height: 50
- paddings: 10
+ padding: 10
FluCheckBox{
text:qsTr("Fits AppBar Windows")
checked: window.fitsAppBarWindows
@@ -89,7 +89,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.topMargin: 20
height: 128
- paddings: 10
+ padding: 10
ColumnLayout{
spacing: 5
@@ -119,7 +119,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.topMargin: 20
height: 160
- paddings: 10
+ padding: 10
ColumnLayout{
spacing: 5
@@ -159,7 +159,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.topMargin: 20
height: 80
- paddings: 10
+ padding: 10
ColumnLayout{
spacing: 10
diff --git a/example/qml/page/T_ShortcutPicker.qml b/example/qml/page/T_ShortcutPicker.qml
index 9d594562..881a3f63 100644
--- a/example/qml/page/T_ShortcutPicker.qml
+++ b/example/qml/page/T_ShortcutPicker.qml
@@ -11,16 +11,15 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 100
- paddings: 10
+ Layout.preferredHeight: 100
+ padding: 10
FluShortcutPicker{
anchors.verticalCenter: parent.verticalCenter
}
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluShortcutPicker{
}'
diff --git a/example/qml/page/T_Slider.qml b/example/qml/page/T_Slider.qml
index 61ca77cd..baa003f2 100644
--- a/example/qml/page/T_Slider.qml
+++ b/example/qml/page/T_Slider.qml
@@ -12,8 +12,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.preferredHeight: 200
- Layout.topMargin: 20
- paddings: 10
+ padding: 10
Row{
spacing: 30
@@ -27,7 +26,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluSlider{
value:50
}'
@@ -38,7 +37,7 @@ FluScrollablePage{
Layout.fillWidth: true
Layout.preferredHeight: 200
Layout.topMargin: 20
- paddings: 10
+ padding: 10
Row{
spacing: 30
FluRangeSlider{
@@ -51,7 +50,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluRangeSlider{
orientation: Qt.Vertical
}'
diff --git a/example/qml/page/T_SplitLayout.qml b/example/qml/page/T_SplitLayout.qml
index 95434212..a7f52cae 100644
--- a/example/qml/page/T_SplitLayout.qml
+++ b/example/qml/page/T_SplitLayout.qml
@@ -13,7 +13,6 @@ FluContentPage{
id:layout_dropdown
anchors{
top: parent.top
- topMargin: 20
}
FluText{
text:"orientation:"
diff --git a/example/qml/page/T_StaggeredLayout.qml b/example/qml/page/T_StaggeredLayout.qml
index a9cdc86c..87470d7a 100644
--- a/example/qml/page/T_StaggeredLayout.qml
+++ b/example/qml/page/T_StaggeredLayout.qml
@@ -27,7 +27,6 @@ FluContentPage{
Flickable{
id: scroll
anchors.fill: parent
- anchors.topMargin: 20
boundsBehavior:Flickable.StopAtBounds
contentHeight: staggered_view.implicitHeight
clip: true
diff --git a/example/qml/page/T_StatusLayout.qml b/example/qml/page/T_StatusLayout.qml
index 04895caf..7e716755 100644
--- a/example/qml/page/T_StatusLayout.qml
+++ b/example/qml/page/T_StatusLayout.qml
@@ -12,9 +12,8 @@ FluScrollablePage{
FluArea{
id:layout_actions
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 50
- paddings: 10
+ Layout.preferredHeight: 50
+ padding: 10
RowLayout{
spacing: 14
FluDropDownButton{
@@ -56,8 +55,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 10
- height: 380
- paddings: 10
+ Layout.preferredHeight: 380
+ padding: 10
FluStatusLayout{
id:status_view
anchors.fill: parent
@@ -76,7 +75,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluStatusLayout{
anchors.fill: parent
statusMode: FluStatusLayoutType.Loading
diff --git a/example/qml/page/T_TabView.qml b/example/qml/page/T_TabView.qml
index c6271337..012d87e3 100644
--- a/example/qml/page/T_TabView.qml
+++ b/example/qml/page/T_TabView.qml
@@ -31,9 +31,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 50
- paddings: 10
+ Layout.preferredHeight: 50
+ padding: 10
RowLayout{
spacing: 14
FluDropDownButton{
@@ -94,8 +93,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 15
- height: 400
- paddings: 10
+ Layout.preferredHeight: 400
+ padding: 10
FluTabView{
id:tab_view
onNewPressed:{
@@ -105,7 +104,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTabView{
anchors.fill: parent
Component.onCompleted: {
diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml
index e3c509be..f3cc051f 100644
--- a/example/qml/page/T_TableView.qml
+++ b/example/qml/page/T_TableView.qml
@@ -159,7 +159,7 @@ FluContentPage{
FluCheckBox{
anchors.centerIn: parent
checked: true === options.checked
- enableAnimation: false
+ animationEnabled: false
clickListener: function(){
var obj = table_view.getRow(row)
obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked})
@@ -239,7 +239,7 @@ FluContentPage{
}
FluCheckBox{
checked: true === root.seletedAll
- enableAnimation: false
+ animationEnabled: false
Layout.alignment: Qt.AlignVCenter
clickListener: function(){
root.seletedAll = !root.seletedAll
diff --git a/example/qml/page/T_Text.qml b/example/qml/page/T_Text.qml
index 70c705ff..1cf8508d 100644
--- a/example/qml/page/T_Text.qml
+++ b/example/qml/page/T_Text.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 60
- paddings: 10
+ Layout.preferredHeight: 60
+ padding: 10
FluCopyableText{
text: qsTr("This is a text that can be copied")
@@ -23,7 +22,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluCopyableText{
text: qsTr("This is a text that can be copied")
}'
diff --git a/example/qml/page/T_TextBox.qml b/example/qml/page/T_TextBox.qml
index a76dcf92..2bfd322d 100644
--- a/example/qml/page/T_TextBox.qml
+++ b/example/qml/page/T_TextBox.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ padding: 10
FluTextBox{
placeholderText: qsTr("Single-line Input Box")
@@ -36,7 +35,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTextBox{
placeholderText: qsTr("Single-line Input Box")
}'
@@ -44,8 +43,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluPasswordBox{
@@ -67,7 +66,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluPasswordBox{
placeholderText: qsTr("Please enter your password")
}'
@@ -75,8 +74,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 36+multiine_textbox.height
- paddings: 10
+ Layout.preferredHeight: 36+multiine_textbox.height
+ padding: 10
Layout.topMargin: 20
FluMultilineTextBox{
@@ -100,7 +99,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluMultilineTextBox{
placeholderText: qsTr("Multi-line Input Box")
}'
@@ -108,8 +107,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluAutoSuggestBox{
placeholderText: qsTr("AutoSuggestBox")
@@ -131,7 +130,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluAutoSuggestBox{
placeholderText: qsTr("AutoSuggestBox")
}'
@@ -139,8 +138,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Layout.topMargin: 20
FluSpinBox{
disabled: spin_box_switch.checked
@@ -160,7 +159,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluSpinBox{
}'
diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml
index dac999b4..cbb4d269 100644
--- a/example/qml/page/T_Theme.qml
+++ b/example/qml/page/T_Theme.qml
@@ -13,9 +13,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
Layout.preferredHeight: 340
- paddings: 10
+ padding: 10
ColumnLayout{
spacing:0
@@ -115,16 +114,16 @@ FluScrollablePage{
}
FluToggleSwitch{
Layout.topMargin: 5
- checked: FluTheme.enableAnimation
+ checked: FluTheme.animationEnabled
onClicked: {
- FluTheme.enableAnimation = !FluTheme.enableAnimation
+ FluTheme.animationEnabled = !FluTheme.animationEnabled
}
}
}
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTheme.accentColor = FluColors.Orange
FluTheme.dark = true
diff --git a/example/qml/page/T_TimePicker.qml b/example/qml/page/T_TimePicker.qml
index 6b86b937..df5261cf 100644
--- a/example/qml/page/T_TimePicker.qml
+++ b/example/qml/page/T_TimePicker.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
launchMode: FluPageType.SingleInstance
FluArea{
Layout.fillWidth: true
- Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
ColumnLayout{
@@ -43,7 +42,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTimePicker{
}'
@@ -52,8 +51,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 80
- paddings: 10
+ Layout.preferredHeight: 80
+ padding: 10
ColumnLayout{
@@ -83,7 +82,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTimePicker{
hourFormat:FluTimePickerType.HH
}'
diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml
index 2b37a1c2..49800109 100644
--- a/example/qml/page/T_Timeline.qml
+++ b/example/qml/page/T_Timeline.qml
@@ -106,7 +106,6 @@ FluScrollablePage{
RowLayout{
spacing: 20
- Layout.topMargin: 20
FluTextBox{
id: text_box
text: "Technical testing 2015-09-01"
diff --git a/example/qml/page/T_ToggleSwitch.qml b/example/qml/page/T_ToggleSwitch.qml
index 464378a2..3ed7f08e 100644
--- a/example/qml/page/T_ToggleSwitch.qml
+++ b/example/qml/page/T_ToggleSwitch.qml
@@ -11,9 +11,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 68
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 68
+ padding: 10
Row{
spacing: 30
anchors.verticalCenter: parent.verticalCenter
@@ -41,7 +40,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluToggleSwitch{
text:"Text"
}'
diff --git a/example/qml/page/T_Tooltip.qml b/example/qml/page/T_Tooltip.qml
index e9799c8b..dd68dbd4 100644
--- a/example/qml/page/T_Tooltip.qml
+++ b/example/qml/page/T_Tooltip.qml
@@ -10,15 +10,14 @@ FluScrollablePage{
title: qsTr("Tooltip")
FluText{
- Layout.topMargin: 20
text: qsTr("Hover over Tultip and it pops up")
}
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Column{
spacing: 5
@@ -41,7 +40,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluIconButton{
iconSource:FluentIcons.ChromeCloseContrast
iconSize: 15
@@ -56,8 +55,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
- height: 68
- paddings: 10
+ Layout.preferredHeight: 68
+ padding: 10
Column{
spacing: 5
@@ -84,7 +83,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluButton{
id: button_1
text: qsTr("Delete")
diff --git a/example/qml/page/T_Tour.qml b/example/qml/page/T_Tour.qml
index 4a38050a..2ac22d19 100644
--- a/example/qml/page/T_Tour.qml
+++ b/example/qml/page/T_Tour.qml
@@ -20,9 +20,8 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
- height: 130
- paddings: 10
- Layout.topMargin: 20
+ Layout.preferredHeight: 130
+ padding: 10
FluFilledButton{
anchors{
@@ -66,7 +65,7 @@ FluScrollablePage{
}
CodeExpander{
Layout.fillWidth: true
- Layout.topMargin: -1
+ Layout.topMargin: -6
code:'FluTour{
id:tour
steps:[
diff --git a/example/qml/page/T_TreeView.qml b/example/qml/page/T_TreeView.qml
index e22db3ce..6bd31dba 100644
--- a/example/qml/page/T_TreeView.qml
+++ b/example/qml/page/T_TreeView.qml
@@ -33,7 +33,6 @@ FluContentPage {
spacing: 12
width: 300
anchors{
- topMargin: 20
top:parent.top
left: parent.left
leftMargin: 10
diff --git a/example/qml/page/T_Typography.qml b/example/qml/page/T_Typography.qml
index 8ff9f270..094335f0 100644
--- a/example/qml/page/T_Typography.qml
+++ b/example/qml/page/T_Typography.qml
@@ -16,9 +16,8 @@ FluContentPage {
left: parent.left
right: parent.right
bottom: parent.bottom
- topMargin: 20
}
- paddings: 10
+ padding: 10
ColumnLayout{
spacing: 0
scale: textScale
diff --git a/example/qml/page/T_Watermark.qml b/example/qml/page/T_Watermark.qml
index 8c5b8a37..dfb2abba 100644
--- a/example/qml/page/T_Watermark.qml
+++ b/example/qml/page/T_Watermark.qml
@@ -11,7 +11,6 @@ FluContentPage{
FluArea{
anchors.fill: parent
- anchors.topMargin: 20
ColumnLayout{
anchors{
diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml
index 10cb310f..5962d28e 100644
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@@ -253,7 +253,7 @@ FluWindow {
}
function handleDarkChanged(button){
- if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
+ if(!FluTheme.animationEnabled || window.fitsAppBarWindows === false){
changeDark()
}else{
if(loader_reveal.sourceComponent){
diff --git a/src/FluTheme.cpp b/src/FluTheme.cpp
index d41b568e..7e3c75af 100644
--- a/src/FluTheme.cpp
+++ b/src/FluTheme.cpp
@@ -14,7 +14,7 @@ FluTheme::FluTheme(QObject *parent):QObject{parent}{
accentColor(FluColors::getInstance()->Blue());
darkMode(FluThemeType::DarkMode::Light);
nativeText(false);
- enableAnimation(true);
+ animationEnabled(true);
_systemDark = systemDark();
qApp->installEventFilter(this);
}
diff --git a/src/FluTheme.h b/src/FluTheme.h
index 1c9cabee..b36da840 100644
--- a/src/FluTheme.h
+++ b/src/FluTheme.h
@@ -32,7 +32,7 @@ class FluTheme : public QObject
Q_PROPERTY_AUTO(QColor,itemCheckColor);
Q_PROPERTY_AUTO(int,darkMode);
Q_PROPERTY_AUTO(bool,nativeText);
- Q_PROPERTY_AUTO(bool,enableAnimation);
+ Q_PROPERTY_AUTO(bool,animationEnabled);
QML_NAMED_ELEMENT(FluTheme)
QML_SINGLETON
private:
diff --git a/src/Qt5/imports/FluentUI/Controls/FluArea.qml b/src/Qt5/imports/FluentUI/Controls/FluArea.qml
index fbc5632e..3701a15f 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluArea.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluArea.qml
@@ -1,28 +1,23 @@
import QtQuick 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
-Rectangle {
- default property alias contentData : layout_content.data
- property int paddings : 0
- property int leftPadding : 0
- property int rightPadding : 0
- property int topPadding : 0
- property int bottomPadding : 0
- id:control
- radius: 4
- 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)
- 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)
- border.width: 1
- implicitHeight: height
- implicitWidth: width
- Item {
- 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)
+T.Frame {
+ property alias border: d.border
+ property alias color: d.color
+ property alias radius: d.radius
+ id: control
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ contentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ contentHeight + topPadding + bottomPadding)
+ padding: 0
+ background: Rectangle {
+ id:d
+ radius: 4
+ 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)
+ 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)
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml b/src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml
index 6b489ec5..3cd525fb 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml
@@ -56,7 +56,7 @@ FluTextBox{
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
contentItem: FluRectangle{
diff --git a/src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml b/src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml
index 28fc6873..9efee0dd 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml
@@ -33,7 +33,7 @@ Item {
properties: "opacity"
from: 1
to: 0
- duration: FluTheme.enableAnimation ? 83 : 1
+ duration: FluTheme.animationEnabled ? 83 : 1
}
}
add: Transition {
@@ -41,7 +41,7 @@ Item {
properties: "opacity"
from: 0
to: 1
- duration: FluTheme.enableAnimation ? 83 : 1
+ duration: FluTheme.animationEnabled ? 83 : 1
}
}
delegate: Item{
diff --git a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
index 90ed6dcb..31c599c6 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -63,7 +63,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -71,7 +71,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
contentItem: Item{
@@ -163,7 +163,7 @@ FluButton {
OpacityAnimator{
from: 0
to: 1
- duration: 88
+ duration: 83
}
ScaleAnimator{
from: 0.5
@@ -176,7 +176,7 @@ FluButton {
OpacityAnimator{
from: 1
to: 0
- duration: 88
+ duration: 83
}
ScaleAnimator{
from: 1.0
diff --git a/src/Qt5/imports/FluentUI/Controls/FluCheckBox.qml b/src/Qt5/imports/FluentUI/Controls/FluCheckBox.qml
index c5c8a4ef..08c37a73 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluCheckBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluCheckBox.qml
@@ -22,7 +22,7 @@ Button {
property alias textColor: btn_text.textColor
property bool textRight: true
property real textSpacing: 6
- property bool enableAnimation: FluTheme.enableAnimation
+ property bool animationEnabled: FluTheme.animationEnabled
property var clickListener : function(){
checked = !checked
}
@@ -94,7 +94,7 @@ Button {
return normalColor
}
Behavior on color {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
ColorAnimation{
duration: 83
}
@@ -107,7 +107,7 @@ Button {
visible: indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 83
}
@@ -121,7 +121,7 @@ Button {
visible: checked && !indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 83
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
index 61700fde..9e3fbe87 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
@@ -120,7 +120,7 @@ T.ComboBox {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -128,7 +128,7 @@ T.ComboBox {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
diff --git a/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml b/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
index a2639d6f..c2c8c528 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
@@ -5,56 +5,4 @@ import QtQuick.Controls 2.15
import FluentUI 1.0
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
- }
- }
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml b/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
index 7d4fca32..51ca5d6b 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
@@ -105,7 +105,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -113,7 +113,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Item{
diff --git a/src/Qt5/imports/FluentUI/Controls/FluExpander.qml b/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
index a2ebd399..9156596e 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
@@ -64,7 +64,7 @@ Item {
iconSource:FluentIcons.ChevronUp
iconSize: 15
Behavior on rotation {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -115,7 +115,7 @@ Item {
to:"expand"
NumberAnimation {
properties: "anchors.topMargin"
- duration: FluTheme.enableAnimation && d.flag ? 167 : 0
+ duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic
}
},
@@ -123,7 +123,7 @@ Item {
to:"collapsed"
NumberAnimation {
properties: "anchors.topMargin"
- duration: FluTheme.enableAnimation && d.flag ? 167 : 0
+ duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
index 78bfa7c0..3773a1e2 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
@@ -54,7 +54,7 @@ FluObject {
NumberAnimation {
properties: "y"
easing.type: Easing.OutCubic
- duration: FluTheme.enableAnimation ? 333 : 0
+ duration: FluTheme.animationEnabled ? 333 : 0
}
}
onChildrenChanged: if(children.length === 0) destroy();
@@ -95,7 +95,7 @@ FluObject {
scale: item ? 1 : 0;
asynchronous: true
Behavior on scale {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation {
easing.type: Easing.OutCubic
duration: 167
diff --git a/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml b/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml
index 597f3dc6..e8318f25 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml
@@ -23,7 +23,7 @@ FluButton {
visible: Number(width)!==0
clip: true
Behavior on width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluMenu.qml b/src/Qt5/imports/FluentUI/Controls/FluMenu.qml
index 3485511d..5af492a1 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluMenu.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluMenu.qml
@@ -5,7 +5,7 @@ import QtQuick.Templates 2.15 as T
import FluentUI 1.0
T.Menu {
- property bool enableAnimation: true
+ property bool animationEnabled: true
id: control
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
contentWidth + leftPadding + rightPadding)
@@ -20,7 +20,7 @@ T.Menu {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -28,7 +28,7 @@ T.Menu {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
}
}
contentItem: ListView {
diff --git a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
index 092ac6af..7ea83d06 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
@@ -167,7 +167,7 @@ Item {
return control.cellHeight
}
Behavior on height {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 83
}
@@ -310,7 +310,7 @@ Item {
return true
}
Behavior on rotation {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -457,7 +457,7 @@ Item {
id:com_panel_item
Item{
Behavior on height {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -771,13 +771,13 @@ Item {
visible: opacity
opacity: d.isMinimal
Behavior on opacity{
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 83
}
}
Behavior on Layout.preferredWidth {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -880,7 +880,7 @@ Item {
}
}
Behavior on anchors.leftMargin {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -925,14 +925,14 @@ Item {
}
x: visible ? 0 : -width
Behavior on width {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
}
}
Behavior on x {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -1012,7 +1012,7 @@ Item {
interactive: false
model:d.handleItems()
boundsBehavior: ListView.StopAtBounds
- highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0
+ highlightMoveDuration: FluTheme.animationEnabled && d.animDisabled ? 167 : 0
highlight: Item{
clip: true
Rectangle{
@@ -1231,10 +1231,14 @@ Item {
}
}
function setCurrentIndex(index){
- nav_list.currentIndex = index
var item = nav_list.model[index]
- if(item instanceof FluPaneItem){
- item.tap()
+ if(item.url){
+ nav_list.currentIndex = index
+ if(item instanceof FluPaneItem){
+ item.tap()
+ }
+ }else{
+ item.onTapListener()
}
}
function getItems(){
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPage.qml b/src/Qt5/imports/FluentUI/Controls/FluPage.qml
index 85b95996..ed33afe9 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPage.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPage.qml
@@ -4,31 +4,45 @@ import QtQuick.Controls 2.15
import QtQuick.Window 2.15
import FluentUI 1.0
-Item {
+Page {
property int launchMode: FluPageType.SingleTop
- property bool animDisabled: false
+ property bool animationEnabled: FluTheme.animationEnabled
property string url : ""
id: control
- opacity: visible
- visible: false
StackView.onRemoved: destroy()
- Behavior on opacity{
- enabled: !animDisabled && FluTheme.enableAnimation
- NumberAnimation{
- duration: 167
- }
- }
+ padding: 5
+ visible: false
+ opacity: visible
transform: Translate {
y: control.visible ? 0 : 80
Behavior on y{
- enabled: !animDisabled && FluTheme.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 167
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: {
- visible = true
+ control.visible = true
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPivot.qml b/src/Qt5/imports/FluentUI/Controls/FluPivot.qml
index 1a850bf5..8fe520bf 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPivot.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPivot.qml
@@ -30,7 +30,7 @@ Page {
spacing: control.headerSpacing
interactive: false
orientation: ListView.Horizontal
- highlightMoveDuration: FluTheme.enableAnimation ? 167 : 0
+ highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
highlight: Item{
clip: true
Rectangle{
@@ -40,7 +40,7 @@ Page {
width: nav_list.currentItem ? nav_list.currentItem.width : 0
y:d.tabY
Behavior on width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPopup.qml b/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
index 8db2098a..1f777f0e 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
@@ -15,7 +15,7 @@ Popup {
enter: Transition {
NumberAnimation {
property: "opacity"
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
from:0
to:1
}
@@ -24,7 +24,7 @@ Popup {
exit:Transition {
NumberAnimation {
property: "opacity"
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
from:1
to:0
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
index 72f18fed..c89ba6fb 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import FluentUI 1.0
ProgressBar{
+ property int duration: 888
property real strokeWidth: 6
property bool progressVisible: false
property color color: FluTheme.primaryColor
@@ -17,7 +18,7 @@ ProgressBar{
if(!indeterminate){
animator_x.duration = 0
rect_progress.x = 0
- animator_x.duration = 888
+ animator_x.duration = control.duration
}
}
background: Rectangle {
@@ -46,7 +47,7 @@ ProgressBar{
from: -rect_progress.width
to:control.width+rect_progress.width
loops: Animation.Infinite
- duration: 888
+ duration: control.duration
}
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml b/src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml
index 1d9e9f9b..19d21e01 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml
@@ -73,10 +73,10 @@ Button {
enabled: control.progress !== 0
SequentialAnimation {
PauseAnimation {
- duration: FluTheme.enableAnimation ? 167 : 0
+ duration: FluTheme.animationEnabled ? 167 : 0
}
NumberAnimation{
- duration: FluTheme.enableAnimation ? 167 : 0
+ duration: FluTheme.animationEnabled ? 167 : 0
from: 3
to: background.height
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluRadioButton.qml b/src/Qt5/imports/FluentUI/Controls/FluRadioButton.qml
index b23f5f06..efa317d3 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluRadioButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluRadioButton.qml
@@ -66,7 +66,7 @@ Button {
return checked ? 4 : 1
}
Behavior on border.width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml b/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
index ee7d0c67..5e1eb09f 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
@@ -5,75 +5,16 @@ import QtQuick.Controls 2.15
import FluentUI 1.0
FluPage {
- property alias title: text_title.text
default property alias content: container.data
- property int spacing : 0
- 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
- 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
- }
+ Flickable{
+ clip: true
+ anchors.fill: parent
+ ScrollBar.vertical: FluScrollBar {}
+ boundsBehavior: Flickable.StopAtBounds
+ contentHeight: container.height
+ ColumnLayout{
+ id:container
+ width: parent.width
}
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml b/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml
index 84260892..1eb8627d 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml
@@ -62,7 +62,7 @@ T.SpinBox {
}
}
Behavior on height{
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 83
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml b/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
index d2c06ace..068325db 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
@@ -43,7 +43,7 @@ Item{
Component{
id:com_loading
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
@@ -63,7 +63,7 @@ Item{
Component {
id:com_empty
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
@@ -80,7 +80,7 @@ Item{
Component{
id:com_error
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml
index 8ac623b0..b25f99c0 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml
@@ -46,7 +46,7 @@ FluClip{
}
}
Behavior on height{
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 83
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml
index 7921222e..7b0da4bb 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTextBoxMenu.qml
@@ -9,7 +9,7 @@ FluMenu{
property string selectAllText : qsTr("Select All")
property var inputItem
id:menu
- enableAnimation: false
+ animationEnabled: false
width: 120
focus: false
onVisibleChanged: {
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml b/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
index d111bf05..1edcc3c8 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
@@ -121,7 +121,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -129,7 +129,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Item{
diff --git a/src/Qt5/imports/FluentUI/Controls/FluToggleSwitch.qml b/src/Qt5/imports/FluentUI/Controls/FluToggleSwitch.qml
index b34f9ffa..e4f01f57 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluToggleSwitch.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluToggleSwitch.qml
@@ -102,7 +102,7 @@ Button {
}
}
Behavior on x {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation {
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
index 17b99f6c..62fb3a54 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
@@ -51,7 +51,7 @@ Item {
}
NumberAnimation {
properties: "opacity"
- duration: 88
+ duration: 83
from: 0
to: 1
}
@@ -70,7 +70,7 @@ Item {
}
NumberAnimation {
properties: "opacity"
- duration: 88
+ duration: 83
from: 0
to: 1
}
@@ -373,7 +373,7 @@ Item {
horizontalPadding:0
verticalPadding: 0
checked: itemModel.checked
- enableAnimation:false
+ animationEnabled:false
visible: control.checkable
padding: 0
clickListener: function(){
diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
index 9ce55a93..81cc588a 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
@@ -142,7 +142,7 @@ Window {
Behavior on opacity {
SequentialAnimation {
PauseAnimation {
- duration: 88
+ duration: 83
}
NumberAnimation{
duration: 167
diff --git a/src/Qt6/imports/FluentUI/Controls/FluArea.qml b/src/Qt6/imports/FluentUI/Controls/FluArea.qml
index 81a08036..a0b34c67 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluArea.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluArea.qml
@@ -1,28 +1,22 @@
import QtQuick
-import QtQuick.Controls
-import QtQuick.Window
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
import FluentUI
-Rectangle {
- default property alias contentData : layout_content.data
- property int paddings : 0
- property int leftPadding : 0
- property int rightPadding : 0
- property int topPadding : 0
- property int bottomPadding : 0
- id:control
- radius: 4
- 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)
- 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)
- border.width: 1
- implicitHeight: height
- implicitWidth: width
- Item {
- 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)
+T.Frame {
+ property alias border: d.border
+ property alias color: d.color
+ property alias radius: d.radius
+ id: control
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ contentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ contentHeight + topPadding + bottomPadding)
+ padding: 0
+ background: Rectangle {
+ id:d
+ radius: 4
+ 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)
+ 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)
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluAutoSuggestBox.qml b/src/Qt6/imports/FluentUI/Controls/FluAutoSuggestBox.qml
index b343ba32..cb37c970 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluAutoSuggestBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluAutoSuggestBox.qml
@@ -55,7 +55,7 @@ FluTextBox{
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
contentItem: FluRectangle{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml b/src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml
index 02d1e3a2..0733e436 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml
@@ -33,7 +33,7 @@ Item {
properties: "opacity"
from: 1
to: 0
- duration: FluTheme.enableAnimation ? 83 : 1
+ duration: FluTheme.animationEnabled ? 83 : 1
}
}
add: Transition {
@@ -41,7 +41,7 @@ Item {
properties: "opacity"
from: 0
to: 1
- duration: FluTheme.enableAnimation ? 83 : 1
+ duration: FluTheme.animationEnabled ? 83 : 1
}
}
delegate: Item{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
index 9790a3e0..4a2b4327 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -62,7 +62,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -70,7 +70,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
contentItem: Item{
@@ -162,7 +162,7 @@ FluButton {
OpacityAnimator{
from: 0
to: 1
- duration: 88
+ duration: 83
}
ScaleAnimator{
from: 0.5
@@ -175,7 +175,7 @@ FluButton {
OpacityAnimator{
from: 1
to: 0
- duration: 88
+ duration: 83
}
ScaleAnimator{
from: 1.0
diff --git a/src/Qt6/imports/FluentUI/Controls/FluCheckBox.qml b/src/Qt6/imports/FluentUI/Controls/FluCheckBox.qml
index 9fdb6b59..177cb084 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluCheckBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluCheckBox.qml
@@ -23,7 +23,7 @@ Button {
property alias textColor: btn_text.textColor
property bool textRight: true
property real textSpacing: 6
- property bool enableAnimation: FluTheme.enableAnimation
+ property bool animationEnabled: FluTheme.animationEnabled
property var clickListener : function(){
checked = !checked
}
@@ -95,7 +95,7 @@ Button {
return normalColor
}
Behavior on color {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
ColorAnimation{
duration: 83
}
@@ -108,7 +108,7 @@ Button {
visible: indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 83
}
@@ -122,7 +122,7 @@ Button {
visible: checked && !indeterminate
iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
Behavior on visible {
- enabled: control.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 83
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
index 6c522bd4..42eb8fa0 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
@@ -120,7 +120,7 @@ T.ComboBox {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -128,7 +128,7 @@ T.ComboBox {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml b/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml
index 02815fab..588c9891 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml
@@ -5,56 +5,4 @@ import QtQuick.Controls
import FluentUI
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
- }
- }
-}
+}
\ No newline at end of file
diff --git a/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml b/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
index a9d46d8d..90adb728 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
@@ -104,7 +104,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -112,7 +112,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Item{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluExpander.qml b/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
index b2230a70..82b305a5 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
@@ -64,7 +64,7 @@ Item {
iconSource:FluentIcons.ChevronUp
iconSize: 15
Behavior on rotation {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -115,7 +115,7 @@ Item {
to:"expand"
NumberAnimation {
properties: "anchors.topMargin"
- duration: FluTheme.enableAnimation && d.flag ? 167 : 0
+ duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic
}
},
@@ -123,7 +123,7 @@ Item {
to:"collapsed"
NumberAnimation {
properties: "anchors.topMargin"
- duration: FluTheme.enableAnimation && d.flag ? 167 : 0
+ duration: FluTheme.animationEnabled && d.flag ? 167 : 0
easing.type: Easing.OutCubic
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
index 4eaa185c..c78d6bed 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
@@ -54,7 +54,7 @@ FluObject {
NumberAnimation {
properties: "y"
easing.type: Easing.OutCubic
- duration: FluTheme.enableAnimation ? 333 : 0
+ duration: FluTheme.animationEnabled ? 333 : 0
}
}
onChildrenChanged: if(children.length === 0) destroy();
@@ -95,7 +95,7 @@ FluObject {
scale: item ? 1 : 0;
asynchronous: true
Behavior on scale {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation {
easing.type: Easing.OutCubic
duration: 167
diff --git a/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml b/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml
index 5b91a281..1d64e66b 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml
@@ -24,7 +24,7 @@ FluButton {
visible: Number(width)!==0
clip: true
Behavior on width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluMenu.qml b/src/Qt6/imports/FluentUI/Controls/FluMenu.qml
index 5090f3ac..f9afab12 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluMenu.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluMenu.qml
@@ -5,7 +5,7 @@ import QtQuick.Templates as T
import FluentUI
T.Menu {
- property bool enableAnimation: true
+ property bool animationEnabled: true
id: control
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
contentWidth + leftPadding + rightPadding)
@@ -20,7 +20,7 @@ T.Menu {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -28,7 +28,7 @@ T.Menu {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled && control.animationEnabled ? 83 : 0
}
}
contentItem: ListView {
diff --git a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
index a44027a7..ad836a3b 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
@@ -168,7 +168,7 @@ Item {
return control.cellHeight
}
Behavior on height {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 83
}
@@ -311,7 +311,7 @@ Item {
return true
}
Behavior on rotation {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -458,7 +458,7 @@ Item {
id:com_panel_item
Item{
Behavior on height {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -772,13 +772,13 @@ Item {
visible: opacity
opacity: d.isMinimal
Behavior on opacity{
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 83
}
}
Behavior on Layout.preferredWidth {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -881,7 +881,7 @@ Item {
}
}
Behavior on anchors.leftMargin {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -926,14 +926,14 @@ Item {
}
x: visible ? 0 : -width
Behavior on width {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
}
}
Behavior on x {
- enabled: FluTheme.enableAnimation && d.animDisabled
+ enabled: FluTheme.animationEnabled && d.animDisabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
@@ -1013,7 +1013,7 @@ Item {
interactive: false
model:d.handleItems()
boundsBehavior: ListView.StopAtBounds
- highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0
+ highlightMoveDuration: FluTheme.animationEnabled && d.animDisabled ? 167 : 0
highlight: Item{
clip: true
Rectangle{
@@ -1232,10 +1232,14 @@ Item {
}
}
function setCurrentIndex(index){
- nav_list.currentIndex = index
var item = nav_list.model[index]
- if(item instanceof FluPaneItem){
- item.tap()
+ if(item.url){
+ nav_list.currentIndex = index
+ if(item instanceof FluPaneItem){
+ item.tap()
+ }
+ }else{
+ item.onTapListener()
}
}
function getItems(){
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPage.qml b/src/Qt6/imports/FluentUI/Controls/FluPage.qml
index 87420acd..95dd1a64 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPage.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPage.qml
@@ -4,40 +4,45 @@ import QtQuick.Controls
import QtQuick.Window
import FluentUI
-Item {
+Page {
property int launchMode: FluPageType.SingleTop
- property bool animDisabled: false
+ property bool animationEnabled: FluTheme.animationEnabled
property string url : ""
- signal animationEnd()
id: control
- opacity: visible
- visible: false
StackView.onRemoved: destroy()
- Behavior on opacity{
- enabled: !animDisabled && FluTheme.enableAnimation
- NumberAnimation{
- duration: 167
- }
- }
+ padding: 5
+ visible: false
+ opacity: visible
transform: Translate {
y: control.visible ? 0 : 80
Behavior on y{
- enabled: !animDisabled && FluTheme.enableAnimation
+ enabled: control.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
}
}
}
- Component.onCompleted: {
- visible = true
- timer.restart()
- }
- Timer{
- id:timer
- interval: !animDisabled && FluTheme.enableAnimation ? 200 : 0
- onTriggered: {
- control.animationEnd()
+ 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: {
+ control.visible = true
+ }
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPivot.qml b/src/Qt6/imports/FluentUI/Controls/FluPivot.qml
index 126f33d1..917fd3b2 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPivot.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPivot.qml
@@ -31,7 +31,7 @@ Page {
spacing: control.headerSpacing
interactive: false
orientation: ListView.Horizontal
- highlightMoveDuration: FluTheme.enableAnimation ? 167 : 0
+ highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
highlight: Item{
clip: true
Rectangle{
@@ -41,7 +41,7 @@ Page {
width: nav_list.currentItem ? nav_list.currentItem.width : 0
y:d.tabY
Behavior on width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPopup.qml b/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
index 78d9d5bb..c933bea3 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
@@ -15,7 +15,7 @@ Popup {
enter: Transition {
NumberAnimation {
property: "opacity"
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
from:0
to:1
}
@@ -24,7 +24,7 @@ Popup {
exit:Transition {
NumberAnimation {
property: "opacity"
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
from:1
to:0
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluProgressButton.qml b/src/Qt6/imports/FluentUI/Controls/FluProgressButton.qml
index 1c21c78e..b33a4d05 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluProgressButton.qml
@@ -74,10 +74,10 @@ Button {
enabled: control.progress !== 0
SequentialAnimation {
PauseAnimation {
- duration: FluTheme.enableAnimation ? 167 : 0
+ duration: FluTheme.animationEnabled ? 167 : 0
}
NumberAnimation{
- duration: FluTheme.enableAnimation ? 167 : 0
+ duration: FluTheme.animationEnabled ? 167 : 0
from: 3
to: background.height
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluRadioButton.qml b/src/Qt6/imports/FluentUI/Controls/FluRadioButton.qml
index ac67b5ee..ab75823a 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluRadioButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluRadioButton.qml
@@ -62,7 +62,7 @@ Button {
return checked ? 4 : 1
}
Behavior on border.width {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml b/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml
index 6aafc0c9..ca710e5f 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml
@@ -5,75 +5,16 @@ import QtQuick.Controls
import FluentUI
FluPage {
- property alias title: text_title.text
default property alias content: container.data
- property int spacing : 0
- 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
- 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
- }
+ Flickable{
+ clip: true
+ anchors.fill: parent
+ ScrollBar.vertical: FluScrollBar {}
+ boundsBehavior: Flickable.StopAtBounds
+ contentHeight: container.height
+ ColumnLayout{
+ id:container
+ width: parent.width
}
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml b/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml
index c3265efa..ecf088c6 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml
@@ -63,7 +63,7 @@ T.SpinBox {
}
}
Behavior on height{
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 83
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml b/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml
index ab82ba21..27fc5c4f 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml
@@ -42,7 +42,7 @@ Item{
Component{
id:com_loading
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
@@ -62,7 +62,7 @@ Item{
Component {
id:com_empty
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
@@ -79,7 +79,7 @@ Item{
Component{
id:com_error
FluArea{
- paddings: 0
+ padding: 0
border.width: 0
radius: 0
color:control.color
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml
index 3ec71baf..f60f0848 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml
@@ -46,7 +46,7 @@ FluClip{
}
}
Behavior on height{
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation{
duration: 83
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBoxMenu.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBoxMenu.qml
index 3be0c1b2..09560414 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTextBoxMenu.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTextBoxMenu.qml
@@ -9,7 +9,7 @@ FluMenu{
property string selectAllText : qsTr("Select All")
property var inputItem
id:menu
- enableAnimation: false
+ animationEnabled: false
width: 120
focus: false
onVisibleChanged: {
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml b/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
index 5cdace5a..a821b320 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
@@ -121,7 +121,7 @@ FluButton {
property: "opacity"
from:0
to:1
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
exit:Transition {
@@ -129,7 +129,7 @@ FluButton {
property: "opacity"
from:1
to:0
- duration: FluTheme.enableAnimation ? 83 : 0
+ duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Item{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluToggleSwitch.qml b/src/Qt6/imports/FluentUI/Controls/FluToggleSwitch.qml
index 9a2f2869..77f17c6f 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluToggleSwitch.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluToggleSwitch.qml
@@ -103,7 +103,7 @@ Button {
}
}
Behavior on x {
- enabled: FluTheme.enableAnimation
+ enabled: FluTheme.animationEnabled
NumberAnimation {
duration: 167
easing.type: Easing.OutCubic
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml
index 12ef0a60..1dc5a2e3 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml
@@ -51,7 +51,7 @@ Item {
}
NumberAnimation {
properties: "opacity"
- duration: 88
+ duration: 83
from: 0
to: 1
}
@@ -70,7 +70,7 @@ Item {
}
NumberAnimation {
properties: "opacity"
- duration: 88
+ duration: 83
from: 0
to: 1
}
@@ -373,7 +373,7 @@ Item {
horizontalPadding:0
verticalPadding: 0
checked: itemModel.checked
- enableAnimation:false
+ animationEnabled:false
visible: control.checkable
padding: 0
clickListener: function(){
diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
index 487c4350..c8d0fff8 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
@@ -141,7 +141,7 @@ Window {
Behavior on opacity {
SequentialAnimation {
PauseAnimation {
- duration: 88
+ duration: 83
}
NumberAnimation{
duration: 167
diff --git a/src/fluentui_en_US.ts b/src/fluentui_en_US.ts
index a6118a50..1164cf23 100644
--- a/src/fluentui_en_US.ts
+++ b/src/fluentui_en_US.ts
@@ -265,8 +265,8 @@
FluWindow
-
-
+
+
diff --git a/src/fluentui_zh_CN.ts b/src/fluentui_zh_CN.ts
index 8dc35f5b..1691047a 100644
--- a/src/fluentui_zh_CN.ts
+++ b/src/fluentui_zh_CN.ts
@@ -269,8 +269,8 @@
FluWindow
-
-
+
+
加载中...