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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-03-29 16:56:09 +08:00
parent cb33af8836
commit 6a5f9d04a9
61 changed files with 105 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Bar Chart") title: qsTr("Bar Chart")
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10
@ -69,7 +69,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
width: 500 width: 500
height: 370 height: 370
padding: 10 padding: 10

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

@ -13,7 +13,7 @@ FluScrollablePage{
return Math.random().toFixed(1); return Math.random().toFixed(1);
} }
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Line Chart") title: qsTr("Line Chart")
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Pie Chart") title: qsTr("Pie Chart")
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10
@ -50,7 +50,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Polar Area Chart") title: qsTr("Polar Area Chart")
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Radar Chart") title: qsTr("Radar Chart")
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -13,7 +13,7 @@ FluScrollablePage{
return Math.random().toFixed(1); return Math.random().toFixed(1);
} }
FluArea{ FluFrame{
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.preferredHeight: 370 Layout.preferredHeight: 370
padding: 10 padding: 10

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

@ -41,7 +41,7 @@ FluScrollablePage{
value: 32 value: 32
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1200/4+20 Layout.preferredHeight: 1200/4+20
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Badge") title: qsTr("Badge")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: 120 height: 120
padding: 10 padding: 10

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

@ -18,7 +18,7 @@ FluScrollablePage{
breadcrumb_2.items = items breadcrumb_2.items = items
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -35,7 +35,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -13,7 +13,7 @@ FluScrollablePage{
text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events") text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events")
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
Layout.topMargin: 10 Layout.topMargin: 10
@ -50,7 +50,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -87,7 +87,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
@ -124,7 +124,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
@ -171,7 +171,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
@ -210,7 +210,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
Layout.topMargin: 20 Layout.topMargin: 20
@ -250,7 +250,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: layout_icon_button.height + 30 Layout.preferredHeight: layout_icon_button.height + 30
padding: 10 padding: 10
@ -331,7 +331,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -388,7 +388,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("CalendarPicker") title: qsTr("CalendarPicker")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 10 padding: 10

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

@ -22,7 +22,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: 370 height: 370
padding: 10 padding: 10
@ -61,7 +61,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: 340 height: 340
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("CheckBox") title: qsTr("CheckBox")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 72 Layout.preferredHeight: 72
padding: 10 padding: 10
@ -54,7 +54,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 72 Layout.preferredHeight: 72
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Clip") title: qsTr("Clip")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 380 Layout.preferredHeight: 380
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("ColorPicker") title: qsTr("ColorPicker")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 60 Layout.preferredHeight: 60
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("ComboBox") title: qsTr("ComboBox")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 5 padding: 5
@ -31,7 +31,7 @@ FluScrollablePage{
} }
} }
FluArea { FluFrame {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 5 padding: 5
@ -55,7 +55,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: 80 height: 80
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("DatePicker") title: qsTr("DatePicker")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 10 padding: 10
@ -37,7 +37,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 80 Layout.preferredHeight: 80

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Dialog") title: qsTr("Dialog")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -56,7 +56,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -113,7 +113,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Expander") title: qsTr("Expander")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: layout_column.height+20 height: layout_column.height+20
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("FlipView") title: qsTr("FlipView")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 340 Layout.preferredHeight: 340
padding: 10 padding: 10
@ -60,7 +60,7 @@ FluScrollablePage{
' '
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
height: 340 height: 340
padding: 10 padding: 10

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

@ -178,7 +178,7 @@ FluScrollablePage{
property string desc: modelData.extra.desc property string desc: modelData.extra.desc
width: 320 width: 320
height: 120 height: 120
FluArea{ FluFrame{
radius: 8 radius: 8
width: 300 width: 300
height: 100 height: 100

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Image") title: qsTr("Image")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 260 Layout.preferredHeight: 260
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("InfoBar") title: qsTr("InfoBar")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 270 Layout.preferredHeight: 270
padding: 10 padding: 10

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

@ -47,7 +47,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10
@ -98,7 +98,7 @@ menu.popup()
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -21,7 +21,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 86 Layout.preferredHeight: 86
padding: 10 padding: 10
@ -43,7 +43,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 86 Layout.preferredHeight: 86
padding: 10 padding: 10
@ -67,7 +67,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 86 Layout.preferredHeight: 86
padding: 10 padding: 10
@ -101,7 +101,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10
@ -135,7 +135,7 @@ FluScrollablePage{
' '
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 130 Layout.preferredHeight: 130
padding: 10 padding: 10

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

@ -532,7 +532,7 @@ FluContentPage{
} }
} }
FluArea{ FluFrame{
anchors{ anchors{
top: layout_flick.top top: layout_flick.top
bottom: layout_flick.bottom bottom: layout_flick.bottom

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Pagination") title: qsTr("Pagination")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 200 Layout.preferredHeight: 200
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Pivot") title: qsTr("Pivot")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 400 Layout.preferredHeight: 400
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Progress") title: qsTr("Progress")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 130 Layout.preferredHeight: 130
padding: 10 padding: 10
@ -41,7 +41,7 @@ FluProgressRing{
' '
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 286 Layout.preferredHeight: 286

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("RadioButton") title: qsTr("RadioButton")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -46,7 +46,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage {
title: qsTr("RatingControl") title: qsTr("RatingControl")
FluArea { FluFrame {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Rectangle") title: qsTr("Rectangle")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 10 padding: 10

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

@ -7,8 +7,9 @@ import "../component"
FluPage{ FluPage{
launchMode: FluPageType.SingleTop launchMode: FluPageType.SingleTop
header:Item{}
FluRemoteLoader{ FluRemoteLoader{
anchors.fill: parent anchors.fill: parent
source: "https://zhu-zichu.gitee.io/Qt5_T_RemoteLoader.qml" source: "https://zhu-zichu.gitee.io/Qt_174_RemoteLoader.qml"
} }
} }

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

@ -17,7 +17,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 60 Layout.preferredHeight: 60
@ -42,7 +42,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 50 height: 50
@ -58,7 +58,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 50 height: 50
@ -85,7 +85,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 128 height: 128
@ -115,7 +115,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 160 height: 160
@ -155,7 +155,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
height: 80 height: 80

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("ShortcutPicker") title: qsTr("ShortcutPicker")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 100 Layout.preferredHeight: 100
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Slider") title: qsTr("Slider")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 200 Layout.preferredHeight: 200
padding: 10 padding: 10
@ -33,7 +33,7 @@ FluScrollablePage{
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 200 Layout.preferredHeight: 200
Layout.topMargin: 20 Layout.topMargin: 20

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("StatusLayout") title: qsTr("StatusLayout")
FluArea{ FluFrame{
id:layout_actions id:layout_actions
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 50 Layout.preferredHeight: 50
@ -52,7 +52,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 10 Layout.topMargin: 10
Layout.preferredHeight: 380 Layout.preferredHeight: 380

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

@ -29,7 +29,7 @@ FluScrollablePage{
newTab() newTab()
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 50 Layout.preferredHeight: 50
padding: 10 padding: 10
@ -90,7 +90,7 @@ FluScrollablePage{
} }
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 15 Layout.topMargin: 15
Layout.preferredHeight: 400 Layout.preferredHeight: 400

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

@ -390,7 +390,7 @@ FluContentPage{
} }
} }
FluArea{ FluFrame{
id:layout_controls id:layout_controls
anchors{ anchors{
left: parent.left left: parent.left

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("Text") title: qsTr("Text")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 60 Layout.preferredHeight: 60
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("TextBox") title: qsTr("TextBox")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -41,7 +41,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -72,7 +72,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 36+multiine_textbox.height Layout.preferredHeight: 36+multiine_textbox.height
padding: 10 padding: 10
@ -105,7 +105,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10
@ -136,7 +136,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10

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

@ -11,7 +11,7 @@ FluScrollablePage{
id: root id: root
title: qsTr("Theme") title: qsTr("Theme")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 340 Layout.preferredHeight: 340
padding: 10 padding: 10

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("TimePicker") title: qsTr("TimePicker")
launchMode: FluPageType.SingleInstance launchMode: FluPageType.SingleInstance
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 80
padding: 10 padding: 10
@ -48,7 +48,7 @@ FluScrollablePage{
}' }'
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 80 Layout.preferredHeight: 80

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

@ -9,7 +9,7 @@ FluScrollablePage{
title: qsTr("ToggleSwitch") title: qsTr("ToggleSwitch")
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 68 Layout.preferredHeight: 68
padding: 10 padding: 10

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

@ -13,7 +13,7 @@ FluScrollablePage{
text: qsTr("Hover over Tultip and it pops up") text: qsTr("Hover over Tultip and it pops up")
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 68 Layout.preferredHeight: 68
@ -52,7 +52,7 @@ FluScrollablePage{
' '
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
Layout.preferredHeight: 68 Layout.preferredHeight: 68

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

@ -18,7 +18,7 @@ FluScrollablePage{
] ]
} }
FluArea{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 130 Layout.preferredHeight: 130
padding: 10 padding: 10

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

@ -102,7 +102,7 @@ FluContentPage {
} }
} }
} }
FluArea{ FluFrame{
anchors{ anchors{
left: layout_column.right left: layout_column.right
top: parent.top top: parent.top

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

@ -10,7 +10,7 @@ FluContentPage {
title: qsTr("Typography") title: qsTr("Typography")
rightPadding: 10 rightPadding: 10
FluArea{ FluFrame{
anchors{ anchors{
top:parent.top top:parent.top
left: parent.left left: parent.left

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

@ -9,7 +9,7 @@ FluContentPage{
title: qsTr("Watermark") title: qsTr("Watermark")
FluArea{ FluFrame{
anchors.fill: parent anchors.fill: parent
ColumnLayout{ ColumnLayout{

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

@ -20,7 +20,7 @@ FluWindow {
loader.reload() loader.reload()
} }
} }
FluArea{ FluFrame{
anchors.fill: parent anchors.fill: parent
FluRemoteLoader{ FluRemoteLoader{
id:loader id:loader

2
src/FluentUI.cpp
View File

@ -36,7 +36,7 @@ void FluentUI::registerTypes(const char *uri){
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAcrylic.qml"),uri,major,minor,"FluAcrylic"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAcrylic.qml"),uri,major,minor,"FluAcrylic");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAppBar.qml"),uri,major,minor,"FluAppBar"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAppBar.qml"),uri,major,minor,"FluAppBar");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluArea.qml"),uri,major,minor,"FluArea"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluFrame.qml"),uri,major,minor,"FluFrame");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBadge.qml"),uri,major,minor,"FluBadge"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBadge.qml"),uri,major,minor,"FluBadge");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBreadcrumbBar.qml"),uri,major,minor,"FluBreadcrumbBar"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluBreadcrumbBar.qml"),uri,major,minor,"FluBreadcrumbBar");

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

@ -76,7 +76,7 @@ FluButton {
} }
contentItem: Item{ contentItem: Item{
clip: true clip: true
FluArea{ FluFrame{
id:container id:container
width: 300 width: 300
height: 360 height: 360

1
src/Qt5/imports/FluentUI/Controls/FluArea.qml → src/Qt5/imports/FluentUI/Controls/FluFrame.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Controls.impl 2.15 import QtQuick.Controls.impl 2.15
import QtQuick.Templates 2.15 as T import QtQuick.Templates 2.15 as T

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

@ -42,7 +42,7 @@ Item{
} }
Component{ Component{
id:com_loading id:com_loading
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
@ -62,7 +62,7 @@ Item{
} }
Component { Component {
id:com_empty id:com_empty
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
@ -79,7 +79,7 @@ Item{
} }
Component{ Component{
id:com_error id:com_error
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0

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

@ -124,7 +124,7 @@ Popup{
ctx.fill() ctx.fill()
} }
} }
FluArea{ FluFrame{
id: layout_panne id: layout_panne
radius: 5 radius: 5
width: 500 width: 500

2
src/Qt5/imports/fluentui.qrc
View File

@ -5,7 +5,6 @@
<file>FluentUI/Font/Segoe_Fluent_Icons.ttf</file> <file>FluentUI/Font/Segoe_Fluent_Icons.ttf</file>
<file>FluentUI/Controls/FluAcrylic.qml</file> <file>FluentUI/Controls/FluAcrylic.qml</file>
<file>FluentUI/Controls/FluAppBar.qml</file> <file>FluentUI/Controls/FluAppBar.qml</file>
<file>FluentUI/Controls/FluArea.qml</file>
<file>FluentUI/Controls/FluAutoSuggestBox.qml</file> <file>FluentUI/Controls/FluAutoSuggestBox.qml</file>
<file>FluentUI/Controls/FluBadge.qml</file> <file>FluentUI/Controls/FluBadge.qml</file>
<file>FluentUI/Controls/FluBreadcrumbBar.qml</file> <file>FluentUI/Controls/FluBreadcrumbBar.qml</file>
@ -107,5 +106,6 @@
<file>FluentUI/Controls/qmldir</file> <file>FluentUI/Controls/qmldir</file>
<file>FluentUI/Controls/FluEvent.qml</file> <file>FluentUI/Controls/FluEvent.qml</file>
<file>FluentUI/Controls/FluEventBus.qml</file> <file>FluentUI/Controls/FluEventBus.qml</file>
<file>FluentUI/Controls/FluFrame.qml</file>
</qresource> </qresource>
</RCC> </RCC>

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

@ -75,7 +75,7 @@ FluButton {
} }
contentItem: Item{ contentItem: Item{
clip: true clip: true
FluArea{ FluFrame{
id:container id:container
width: 300 width: 300
height: 360 height: 360

0
src/Qt6/imports/FluentUI/Controls/FluArea.qml → src/Qt6/imports/FluentUI/Controls/FluFrame.qml
View File

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

@ -41,7 +41,7 @@ Item{
} }
Component{ Component{
id:com_loading id:com_loading
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
@ -61,7 +61,7 @@ Item{
} }
Component { Component {
id:com_empty id:com_empty
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0
@ -78,7 +78,7 @@ Item{
} }
Component{ Component{
id:com_error id:com_error
FluArea{ FluFrame{
padding: 0 padding: 0
border.width: 0 border.width: 0
radius: 0 radius: 0

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

@ -124,7 +124,7 @@ Popup{
ctx.fill() ctx.fill()
} }
} }
FluArea{ FluFrame{
id: layout_panne id: layout_panne
radius: 5 radius: 5
width: 500 width: 500