amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 21:37:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-11-02 23:02:08 +08:00
parent eef46a2dac
commit fa77ed6163
43 changed files with 111 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ FluWindow {
} }
} }
Loader{ FluLoader{
id:loader_reveal id:loader_reveal
anchors.fill: parent anchors.fill: parent
} }

2
example/qml-Qt6/window/PageWindow.qml
View File

@ -18,7 +18,7 @@ FluWindow {
window.title = arg.title window.title = arg.title
loader.setSource( arg.url,{animDisabled:true}) loader.setSource( arg.url,{animDisabled:true})
} }
Loader{ FluLoader{
id: loader id: loader
anchors.fill: parent anchors.fill: parent
} }

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

@ -247,7 +247,7 @@ FluWindow {
} }
} }
Loader{ FluLoader{
id:loader_reveal id:loader_reveal
anchors.fill: parent anchors.fill: parent
} }

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

@ -19,7 +19,7 @@ FluWindow {
window.title = arg.title window.title = arg.title
loader.setSource( arg.url,{animDisabled:true}) loader.setSource( arg.url,{animDisabled:true})
} }
Loader{ FluLoader{
id: loader id: loader
anchors.fill: parent anchors.fill: parent
} }

2
src/FluentUI.cpp
View File

@ -151,6 +151,8 @@ void FluentUI::registerTypes(const char *uri){
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluProgressButton.qml"),uri,major,minor,"FluProgressButton"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluProgressButton.qml"),uri,major,minor,"FluProgressButton");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoadingButton.qml"),uri,major,minor,"FluLoadingButton"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoadingButton.qml"),uri,major,minor,"FluLoadingButton");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluClip.qml"),uri,major,minor,"FluClip"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluClip.qml"),uri,major,minor,"FluClip");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoader.qml"),uri,major,minor,"FluLoader");
qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject, uri,major,minor,"FluentIcons", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject, uri,major,minor,"FluentIcons", "Access to enums & flags only");
qmlRegisterUncreatableMetaObject(FluHttpType::staticMetaObject, uri,major,minor,"FluHttpType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluHttpType::staticMetaObject, uri,major,minor,"FluHttpType", "Access to enums & flags only");

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

@ -331,7 +331,7 @@ Item {
cellWidth: displayMode === FluCalendarViewType.Month ? 40 : 70 cellWidth: displayMode === FluCalendarViewType.Month ? 40 : 70
clip: true clip: true
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var modelData : model property var modelData : model
property var name : model.name property var name : model.name
property var date : model.date property var date : model.date

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

@ -75,7 +75,7 @@ Item {
return 0 return 0
return index-1 return index-1
} }
Loader{ FluLoader{
property int displayIndex : item_control.displayIndex property int displayIndex : item_control.displayIndex
property var model: list_view.model.get(index) property var model: list_view.model.get(index)
anchors.fill: parent anchors.fill: parent
@ -156,7 +156,7 @@ Item {
Repeater{ Repeater{
id:repeater_indicator id:repeater_indicator
model: list_view.count model: list_view.count
Loader{ FluLoader{
property int displayIndex: { property int displayIndex: {
if(index === 0) if(index === 0)
return list_view.count-3 return list_view.count-3

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

@ -232,7 +232,7 @@ Rectangle {
preferredHighlightEnd: 0 preferredHighlightEnd: 0
highlightMoveDuration: 0 highlightMoveDuration: 0
visible: showYear visible: showYear
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:0 property int type:0
property int position:index property int position:index
@ -254,7 +254,7 @@ Rectangle {
preferredHighlightEnd: 0 preferredHighlightEnd: 0
highlightMoveDuration: 0 highlightMoveDuration: 0
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:1 property int type:1
property int position:index property int position:index
@ -277,7 +277,7 @@ Rectangle {
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:2 property int type:2
property int position:index property int position:index

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

@ -71,7 +71,7 @@ Button {
Component{ Component{
id:com_row id:com_row
RowLayout{ RowLayout{
Loader{ FluLoader{
sourceComponent: iconDelegate sourceComponent: iconDelegate
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.TextOnly visible: display !== Button.TextOnly
@ -86,7 +86,7 @@ Button {
Component{ Component{
id:com_column id:com_column
ColumnLayout{ ColumnLayout{
Loader{ FluLoader{
sourceComponent: iconDelegate sourceComponent: iconDelegate
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.TextOnly visible: display !== Button.TextOnly

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

@ -11,7 +11,7 @@ Image {
property Component errorItem : com_error property Component errorItem : com_error
property Component loadingItem: com_loading property Component loadingItem: com_loading
id: control id: control
Loader{ FluLoader{
anchors.fill: parent anchors.fill: parent
sourceComponent: { sourceComponent: {
if(control.status === Image.Loading){ if(control.status === Image.Loading){

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

@ -86,7 +86,7 @@ FluObject {
interval: duration; running: duration > 0; repeat: duration > 0 interval: duration; running: duration > 0; repeat: duration > 0
onTriggered: content.close(); onTriggered: content.close();
} }
Loader{ FluLoader{
id:loader; id:loader;
x:(parent.width - width) / 2; x:(parent.width - width) / 2;
property var _super: content; property var _super: content;

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

@ -60,7 +60,7 @@ T.MenuItem {
right: parent.right right: parent.right
rightMargin: (control.mirrored ? indicatorPadding : arrowPadding)+5 rightMargin: (control.mirrored ? indicatorPadding : arrowPadding)+5
} }
Loader{ FluLoader{
id:loader_icon id:loader_icon
sourceComponent: iconDelegate sourceComponent: iconDelegate
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

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

@ -334,7 +334,7 @@ Item {
left:parent.left left:parent.left
leftMargin: 3 leftMargin: 3
} }
Loader{ FluLoader{
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: { sourceComponent: {
if(model&&model.iconDelegate){ if(model&&model.iconDelegate){
@ -342,7 +342,6 @@ Item {
} }
return com_icon return com_icon
} }
Component.onDestruction: sourceComponent = undefined
} }
} }
FluText{ FluText{
@ -381,7 +380,7 @@ Item {
return FluTheme.dark ? FluColors.White : FluColors.Grey220 return FluTheme.dark ? FluColors.White : FluColors.Grey220
} }
} }
Loader{ FluLoader{
id:item_edit_loader id:item_edit_loader
anchors{ anchors{
top: parent.top top: parent.top
@ -390,7 +389,6 @@ Item {
right: item_title.right right: item_title.right
rightMargin: 8 rightMargin: 8
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(d.isCompact){ if(d.isCompact){
return undefined return undefined
@ -398,7 +396,7 @@ Item {
return model&&model.showEdit ? model.editDelegate : undefined return model&&model.showEdit ? model.editDelegate : undefined
} }
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === FluLoader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
item_connection_edit_focus.target = item item_connection_edit_focus.target = item
} }
@ -554,9 +552,8 @@ Item {
left:parent.left left:parent.left
leftMargin: 3 leftMargin: 3
} }
Loader{ FluLoader{
anchors.centerIn: parent anchors.centerIn: parent
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model&&model.iconDelegate){ if(model&&model.iconDelegate){
return model.iconDelegate return model.iconDelegate
@ -601,7 +598,7 @@ Item {
right: item_dot_loader.left right: item_dot_loader.left
} }
} }
Loader{ FluLoader{
id:item_edit_loader id:item_edit_loader
anchors{ anchors{
top: parent.top top: parent.top
@ -619,9 +616,8 @@ Item {
} }
return model.showEdit ? model.editDelegate : undefined return model.showEdit ? model.editDelegate : undefined
} }
Component.onDestruction: sourceComponent = undefined
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === FluLoader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
item_connection_edit_focus.target = item item_connection_edit_focus.target = item
} }
@ -640,7 +636,7 @@ Item {
} }
} }
} }
Loader{ FluLoader{
id:item_dot_loader id:item_dot_loader
property bool isDot: (item_dot_loader.item&&item_dot_loader.item.isDot) property bool isDot: (item_dot_loader.item&&item_dot_loader.item.isDot)
anchors{ anchors{
@ -655,7 +651,6 @@ Item {
} }
return undefined return undefined
} }
Component.onDestruction: sourceComponent = undefined
Connections{ Connections{
target: d target: d
function onIsCompactAndNotPanelChanged(){ function onIsCompactAndNotPanelChanged(){
@ -785,11 +780,10 @@ Item {
} }
return 0 return 0
} }
Loader{ FluLoader{
id:loader_action id:loader_action
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: actionItem sourceComponent: actionItem
Component.onDestruction: sourceComponent = undefined
} }
} }
} }
@ -828,7 +822,7 @@ Item {
} }
} }
} }
Loader{ FluLoader{
id:loader_content id:loader_content
anchors{ anchors{
left: parent.left left: parent.left
@ -845,7 +839,6 @@ Item {
return control.cellWidth return control.cellWidth
} }
} }
Component.onDestruction: sourceComponent = undefined
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
enabled: FluTheme.enableAnimation && d.animDisabled enabled: FluTheme.enableAnimation && d.animDisabled
NumberAnimation{ NumberAnimation{
@ -915,7 +908,7 @@ Item {
clip: true clip: true
y:nav_app_bar.height+control.topPadding y:nav_app_bar.height+control.topPadding
height: autoSuggestBox ? 38 : 0 height: autoSuggestBox ? 38 : 0
Loader{ FluLoader{
id:loader_auto_suggest_box id:loader_auto_suggest_box
sourceComponent: autoSuggestBox sourceComponent: autoSuggestBox
anchors{ anchors{
@ -925,7 +918,6 @@ Item {
rightMargin: 6 rightMargin: 6
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
Component.onDestruction: sourceComponent = undefined
visible: { visible: {
if(d.isCompactAndNotPanel){ if(d.isCompactAndNotPanel){
return false return false
@ -993,11 +985,10 @@ Item {
} }
} }
currentIndex: -1 currentIndex: -1
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 0 property int type: 0
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model === null || !model) if(model === null || !model)
return undefined return undefined
@ -1051,11 +1042,10 @@ Item {
} }
} }
} }
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 1 property int type: 1
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(modelData instanceof FluPaneItem){ if(modelData instanceof FluPaneItem){
return com_panel_item return com_panel_item
@ -1117,14 +1107,13 @@ Item {
radius:4 radius:4
} }
Loader{ FluLoader{
id:item_dot_loader id:item_dot_loader
anchors{ anchors{
right: parent.right right: parent.right
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
rightMargin: 10 rightMargin: 10
} }
Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
if(model.infoBadge){ if(model.infoBadge){
return model.infoBadge return model.infoBadge
@ -1175,9 +1164,8 @@ Item {
control_popup.open() control_popup.open()
} }
} }
Loader{ FluLoader{
property var modelData property var modelData
Component.onDestruction: sourceComponent = undefined
id:loader_item_menu id:loader_item_menu
} }
Connections{ Connections{

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

@ -84,7 +84,7 @@ Page {
anchors.fill: parent anchors.fill: parent
Repeater{ Repeater{
model:d.children model:d.children
Loader{ FluLoader{
property var argument: modelData.argument property var argument: modelData.argument
anchors.fill: parent anchors.fill: parent
sourceComponent: modelData.contentItem sourceComponent: modelData.contentItem

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

@ -15,7 +15,7 @@ FluStatusView {
loader.source = control.source loader.source = control.source
} }
} }
Loader{ FluLoader{
id:loader id:loader
anchors.fill: parent anchors.fill: parent
asynchronous: true asynchronous: true

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

@ -23,7 +23,7 @@ Item{
anchors.fill: parent anchors.fill: parent
visible: statusMode===FluStatusViewType.Success visible: statusMode===FluStatusViewType.Success
} }
Loader{ FluLoader{
id:loader id:loader
anchors.fill: parent anchors.fill: parent
visible: statusMode!==FluStatusViewType.Success visible: statusMode!==FluStatusViewType.Success

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

@ -273,7 +273,7 @@ Item {
} }
Repeater{ Repeater{
model:tab_model model:tab_model
Loader{ FluLoader{
property var argument: model.argument property var argument: model.argument
anchors.fill: parent anchors.fill: parent
sourceComponent: model.page sourceComponent: model.page

12
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -301,7 +301,7 @@ Rectangle {
event.accepted = true event.accepted = true
} }
} }
Loader{ FluLoader{
property var itemModel: model property var itemModel: model
property var modelData: display property var modelData: display
property var tableView: table_view property var tableView: table_view
@ -341,7 +341,7 @@ Rectangle {
onEntered: { onEntered: {
d.rowHoverIndex = -1 d.rowHoverIndex = -1
} }
Loader{ FluLoader{
id:item_loader id:item_loader
property var display property var display
property int column property int column
@ -393,8 +393,10 @@ Rectangle {
property bool canceled: false property bool canceled: false
property int columnIndex: column property int columnIndex: column
readonly property var obj : columnSource[column] readonly property var obj : columnSource[column]
implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitWidth: {
implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) return (item_column_loader.item && item_column_loader.item.implicitWidth) + (cellPadding * 2)
}
implicitHeight: Math.max(36, (item_column_loader.item&&item_column_loader.item.implicitHeight) + (cellPadding * 2))
color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
@ -443,7 +445,7 @@ Rectangle {
closeEditor() closeEditor()
} }
} }
Loader{ FluLoader{
id:item_column_loader id:item_column_loader
property var itemModel: model property var itemModel: model
property var modelData: model.display property var modelData: model.display

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

@ -238,7 +238,7 @@ Rectangle {
highlightMoveDuration: 0 highlightMoveDuration: 0
model: isH ? generateArray(1,12) : generateArray(0,23) model: isH ? generateArray(1,12) : generateArray(0,23)
clip: true clip: true
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:0 property int type:0
property int position:index property int position:index
@ -261,7 +261,7 @@ Rectangle {
highlightMoveDuration: 0 highlightMoveDuration: 0
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:1 property int type:1
property int position:index property int position:index
@ -287,7 +287,7 @@ Rectangle {
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:2 property int type:2
property int position:index property int position:index

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

@ -116,7 +116,7 @@ Item{
id:item_layout id:item_layout
width: layout_column.width width: layout_column.width
height: loader_text.height height: loader_text.height
Loader{ FluLoader{
id:item_loader id:item_loader
state: d.stateName state: d.stateName
states: [ states: [
@ -149,7 +149,7 @@ Item{
} }
} }
Loader{ FluLoader{
property var modelData: control.model.get(index) property var modelData: control.model.get(index)
property bool isRight: state === "Right" property bool isRight: state === "Right"
id:loader_lable id:loader_lable
@ -219,7 +219,7 @@ Item{
] ]
} }
Loader{ FluLoader{
id:loader_text id:loader_text
property var modelData: control.model.get(index) property var modelData: control.model.get(index)
property bool isRight: state === "Right" property bool isRight: state === "Right"

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

@ -155,7 +155,7 @@ Popup{
leftMargin: 15 leftMargin: 15
} }
} }
Loader{ FluLoader{
id:loader_next id:loader_next
property bool isEnd: control.index === steps.length-1 property bool isEnd: control.index === steps.length-1
sourceComponent: com_next_button sourceComponent: com_next_button
@ -166,7 +166,7 @@ Popup{
rightMargin: 15 rightMargin: 15
} }
} }
Loader{ FluLoader{
id:loader_prev id:loader_prev
visible: control.index !== 0 visible: control.index !== 0
sourceComponent: com_prev_button sourceComponent: com_prev_button

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

@ -86,7 +86,7 @@ Item {
ListView.onPooled: { ListView.onPooled: {
item_loader_container.item.pooled() item_loader_container.item.pooled()
} }
Loader{ FluLoader{
property var itemControl: item_control property var itemControl: item_control
property var itemModel: dataModel property var itemModel: dataModel
property int rowIndex: index property int rowIndex: index
@ -95,7 +95,7 @@ Item {
sourceComponent: com_item_container sourceComponent: com_item_container
} }
} }
Loader{ FluLoader{
id:loader_container id:loader_container
property var itemControl property var itemControl
property var itemModel property var itemModel
@ -357,7 +357,7 @@ Item {
} }
} }
Loader{ FluLoader{
id:item_loader_expand id:item_loader_expand
Layout.preferredWidth: 20 Layout.preferredWidth: 20
Layout.preferredHeight: 20 Layout.preferredHeight: 20
@ -381,7 +381,7 @@ Item {
} }
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
Loader{ FluLoader{
property var dataModel: itemModel property var dataModel: itemModel
property var itemMouse: item_mouse property var itemMouse: item_mouse
id:item_loader_cell id:item_loader_cell

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

@ -94,11 +94,11 @@ Window {
showStayTop: window.showStayTop showStayTop: window.showStayTop
} }
} }
Loader{ FluLoader{
anchors.fill: parent anchors.fill: parent
sourceComponent: background sourceComponent: background
} }
Loader{ FluLoader{
id: loader_title_bar id: loader_title_bar
anchors { anchors {
top: parent.top top: parent.top
@ -117,7 +117,7 @@ Window {
} }
clip: true clip: true
} }
Loader{ FluLoader{
property string loadingText: "加载中..." property string loadingText: "加载中..."
property bool cancel: false property bool cancel: false
id:loader_loading id:loader_loading

1
src/Qt5/imports/FluentUI/qmldir
View File

@ -95,4 +95,5 @@ FluStaggeredView 1.0 Controls/FluStaggeredView.qml
FluProgressButton 1.0 Controls/FluProgressButton.qml FluProgressButton 1.0 Controls/FluProgressButton.qml
FluLoadingButton 1.0 Controls/FluLoadingButton.qml FluLoadingButton 1.0 Controls/FluLoadingButton.qml
FluClip 1.0 Controls/FluClip.qml FluClip 1.0 Controls/FluClip.qml
FluLoader 1.0 Controls/FluLoader.qml
plugin fluentuiplugin plugin fluentuiplugin

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

@ -95,5 +95,6 @@
<file>FluentUI/Controls/ColorPicker/Content/SBPicker.qml</file> <file>FluentUI/Controls/ColorPicker/Content/SBPicker.qml</file>
<file>FluentUI/Controls/FluLoadingButton.qml</file> <file>FluentUI/Controls/FluLoadingButton.qml</file>
<file>FluentUI/Controls/FluClip.qml</file> <file>FluentUI/Controls/FluClip.qml</file>
<file>FluentUI/Controls/FluLoader.qml</file>
</qresource> </qresource>
</RCC> </RCC>

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

@ -331,7 +331,7 @@ Item {
cellWidth: displayMode === FluCalendarViewType.Month ? 40 : 70 cellWidth: displayMode === FluCalendarViewType.Month ? 40 : 70
clip: true clip: true
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var modelData : model property var modelData : model
property var name : model.name property var name : model.name
property var date : model.date property var date : model.date

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

@ -75,7 +75,7 @@ Item {
return 0 return 0
return index-1 return index-1
} }
Loader{ FluLoader{
property int displayIndex : item_control.displayIndex property int displayIndex : item_control.displayIndex
property var model: list_view.model.get(index) property var model: list_view.model.get(index)
anchors.fill: parent anchors.fill: parent
@ -156,7 +156,7 @@ Item {
Repeater{ Repeater{
id:repeater_indicator id:repeater_indicator
model: list_view.count model: list_view.count
Loader{ FluLoader{
property int displayIndex: { property int displayIndex: {
if(index === 0) if(index === 0)
return list_view.count-3 return list_view.count-3

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

@ -232,7 +232,7 @@ Rectangle {
preferredHighlightEnd: 0 preferredHighlightEnd: 0
highlightMoveDuration: 0 highlightMoveDuration: 0
visible: showYear visible: showYear
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:0 property int type:0
property int position:index property int position:index
@ -254,7 +254,7 @@ Rectangle {
preferredHighlightEnd: 0 preferredHighlightEnd: 0
highlightMoveDuration: 0 highlightMoveDuration: 0
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:1 property int type:1
property int position:index property int position:index
@ -277,7 +277,7 @@ Rectangle {
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:2 property int type:2
property int position:index property int position:index

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

@ -72,7 +72,7 @@ Button {
Component{ Component{
id:com_row id:com_row
RowLayout{ RowLayout{
Loader{ FluLoader{
sourceComponent: iconDelegate sourceComponent: iconDelegate
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.TextOnly visible: display !== Button.TextOnly
@ -87,7 +87,7 @@ Button {
Component{ Component{
id:com_column id:com_column
ColumnLayout{ ColumnLayout{
Loader{ FluLoader{
sourceComponent: iconDelegate sourceComponent: iconDelegate
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.TextOnly visible: display !== Button.TextOnly
@ -99,7 +99,7 @@ Button {
} }
} }
} }
contentItem:Loader{ contentItem:FluLoader{
sourceComponent: { sourceComponent: {
if(display === Button.TextUnderIcon){ if(display === Button.TextUnderIcon){
return com_column return com_column

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

@ -11,7 +11,7 @@ Image {
property Component errorItem : com_error property Component errorItem : com_error
property Component loadingItem: com_loading property Component loadingItem: com_loading
id: control id: control
Loader{ FluLoader{
anchors.fill: parent anchors.fill: parent
sourceComponent: { sourceComponent: {
if(control.status === Image.Loading){ if(control.status === Image.Loading){

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

@ -86,7 +86,7 @@ FluObject {
interval: duration; running: duration > 0; repeat: duration > 0 interval: duration; running: duration > 0; repeat: duration > 0
onTriggered: content.close(); onTriggered: content.close();
} }
Loader{ FluLoader{
id:loader; id:loader;
x:(parent.width - width) / 2; x:(parent.width - width) / 2;
property var _super: content; property var _super: content;

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

@ -61,7 +61,7 @@ T.MenuItem {
right: parent.right right: parent.right
rightMargin: (control.mirrored ? indicatorPadding : arrowPadding)+5 rightMargin: (control.mirrored ? indicatorPadding : arrowPadding)+5
} }
Loader{ FluLoader{
id:loader_icon id:loader_icon
sourceComponent: iconDelegate sourceComponent: iconDelegate
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

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

@ -335,7 +335,7 @@ Item {
left:parent.left left:parent.left
leftMargin: 3 leftMargin: 3
} }
Loader{ FluLoader{
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: { sourceComponent: {
if(model&&model.iconDelegate){ if(model&&model.iconDelegate){
@ -382,7 +382,7 @@ Item {
return FluTheme.dark ? FluColors.White : FluColors.Grey220 return FluTheme.dark ? FluColors.White : FluColors.Grey220
} }
} }
Loader{ FluLoader{
id:item_edit_loader id:item_edit_loader
anchors{ anchors{
top: parent.top top: parent.top
@ -399,7 +399,7 @@ Item {
return model&&model.showEdit ? model.editDelegate : undefined return model&&model.showEdit ? model.editDelegate : undefined
} }
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === FluLoader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
item_connection_edit_focus.target = item item_connection_edit_focus.target = item
} }
@ -555,7 +555,7 @@ Item {
left:parent.left left:parent.left
leftMargin: 3 leftMargin: 3
} }
Loader{ FluLoader{
anchors.centerIn: parent anchors.centerIn: parent
Component.onDestruction: sourceComponent = undefined Component.onDestruction: sourceComponent = undefined
sourceComponent: { sourceComponent: {
@ -602,7 +602,7 @@ Item {
right: item_dot_loader.left right: item_dot_loader.left
} }
} }
Loader{ FluLoader{
id:item_edit_loader id:item_edit_loader
anchors{ anchors{
top: parent.top top: parent.top
@ -622,7 +622,7 @@ Item {
} }
Component.onDestruction: sourceComponent = undefined Component.onDestruction: sourceComponent = undefined
onStatusChanged: { onStatusChanged: {
if(status === Loader.Ready){ if(status === FluLoader.Ready){
item.forceActiveFocus() item.forceActiveFocus()
item_connection_edit_focus.target = item item_connection_edit_focus.target = item
} }
@ -641,7 +641,7 @@ Item {
} }
} }
} }
Loader{ FluLoader{
id:item_dot_loader id:item_dot_loader
property bool isDot: (item_dot_loader.item&&item_dot_loader.item.isDot) property bool isDot: (item_dot_loader.item&&item_dot_loader.item.isDot)
anchors{ anchors{
@ -786,7 +786,7 @@ Item {
} }
return 0 return 0
} }
Loader{ FluLoader{
id:loader_action id:loader_action
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: actionItem sourceComponent: actionItem
@ -829,7 +829,7 @@ Item {
} }
} }
} }
Loader{ FluLoader{
id:loader_content id:loader_content
anchors{ anchors{
left: parent.left left: parent.left
@ -916,7 +916,7 @@ Item {
clip: true clip: true
y:nav_app_bar.height+control.topPadding y:nav_app_bar.height+control.topPadding
height: autoSuggestBox ? 38 : 0 height: autoSuggestBox ? 38 : 0
Loader{ FluLoader{
id:loader_auto_suggest_box id:loader_auto_suggest_box
sourceComponent: autoSuggestBox sourceComponent: autoSuggestBox
anchors{ anchors{
@ -994,7 +994,7 @@ Item {
} }
} }
currentIndex: -1 currentIndex: -1
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 0 property int type: 0
@ -1052,7 +1052,7 @@ Item {
} }
} }
} }
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
property int type: 1 property int type: 1
@ -1118,7 +1118,7 @@ Item {
radius:4 radius:4
} }
Loader{ FluLoader{
id:item_dot_loader id:item_dot_loader
anchors{ anchors{
right: parent.right right: parent.right
@ -1176,7 +1176,7 @@ Item {
control_popup.open() control_popup.open()
} }
} }
Loader{ FluLoader{
property var modelData property var modelData
Component.onDestruction: sourceComponent = undefined Component.onDestruction: sourceComponent = undefined
id:loader_item_menu id:loader_item_menu

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

@ -84,7 +84,7 @@ Page {
anchors.fill: parent anchors.fill: parent
Repeater{ Repeater{
model:d.children model:d.children
Loader{ FluLoader{
property var argument: modelData.argument property var argument: modelData.argument
anchors.fill: parent anchors.fill: parent
sourceComponent: modelData.contentItem sourceComponent: modelData.contentItem

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

@ -15,7 +15,7 @@ FluStatusView {
loader.source = control.source loader.source = control.source
} }
} }
Loader{ FluLoader{
id:loader id:loader
anchors.fill: parent anchors.fill: parent
asynchronous: true asynchronous: true

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

@ -22,7 +22,7 @@ Item{
anchors.fill: parent anchors.fill: parent
visible: statusMode===FluStatusViewType.Success visible: statusMode===FluStatusViewType.Success
} }
Loader{ FluLoader{
id:loader id:loader
anchors.fill: parent anchors.fill: parent
visible: statusMode!==FluStatusViewType.Success visible: statusMode!==FluStatusViewType.Success

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

@ -273,7 +273,7 @@ Item {
} }
Repeater{ Repeater{
model:tab_model model:tab_model
Loader{ FluLoader{
property var argument: model.argument property var argument: model.argument
anchors.fill: parent anchors.fill: parent
sourceComponent: model.page sourceComponent: model.page

12
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -302,7 +302,7 @@ Rectangle {
event.accepted = true event.accepted = true
} }
} }
Loader{ FluLoader{
property var itemModel: model property var itemModel: model
property var modelData: display property var modelData: display
property var tableView: table_view property var tableView: table_view
@ -342,7 +342,7 @@ Rectangle {
onEntered: { onEntered: {
d.rowHoverIndex = -1 d.rowHoverIndex = -1
} }
Loader{ FluLoader{
id:item_loader id:item_loader
property var display property var display
property int column property int column
@ -394,8 +394,10 @@ Rectangle {
property bool canceled: false property bool canceled: false
property int columnIndex: column property int columnIndex: column
readonly property var obj : columnSource[column] readonly property var obj : columnSource[column]
implicitWidth: item_column_loader.item.implicitWidth + (cellPadding * 2) implicitWidth: {
implicitHeight: Math.max(36, item_column_loader.item.implicitHeight + (cellPadding * 2)) return (item_column_loader.item && item_column_loader.item.implicitWidth) + (cellPadding * 2)
}
implicitHeight: Math.max(36, (item_column_loader.item&&item_column_loader.item.implicitHeight) + (cellPadding * 2))
color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1) color: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
Rectangle{ Rectangle{
border.color: control.borderColor border.color: control.borderColor
@ -444,7 +446,7 @@ Rectangle {
closeEditor() closeEditor()
} }
} }
Loader{ FluLoader{
id:item_column_loader id:item_column_loader
property var itemModel: model property var itemModel: model
property var modelData: model.display property var modelData: model.display

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

@ -238,7 +238,7 @@ Rectangle {
highlightMoveDuration: 0 highlightMoveDuration: 0
model: isH ? generateArray(1,12) : generateArray(0,23) model: isH ? generateArray(1,12) : generateArray(0,23)
clip: true clip: true
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:0 property int type:0
property int position:index property int position:index
@ -261,7 +261,7 @@ Rectangle {
highlightMoveDuration: 0 highlightMoveDuration: 0
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:1 property int type:1
property int position:index property int position:index
@ -287,7 +287,7 @@ Rectangle {
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds boundsBehavior:Flickable.StopAtBounds
delegate: Loader{ delegate: FluLoader{
property var model: modelData property var model: modelData
property int type:2 property int type:2
property int position:index property int position:index

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

@ -116,7 +116,7 @@ Item{
id:item_layout id:item_layout
width: layout_column.width width: layout_column.width
height: loader_text.height height: loader_text.height
Loader{ FluLoader{
id:item_loader id:item_loader
state: d.stateName state: d.stateName
states: [ states: [
@ -149,7 +149,7 @@ Item{
} }
} }
Loader{ FluLoader{
property var modelData: control.model.get(index) property var modelData: control.model.get(index)
property bool isRight: state === "Right" property bool isRight: state === "Right"
id:loader_lable id:loader_lable
@ -219,7 +219,7 @@ Item{
] ]
} }
Loader{ FluLoader{
id:loader_text id:loader_text
property var modelData: control.model.get(index) property var modelData: control.model.get(index)
property bool isRight: state === "Right" property bool isRight: state === "Right"

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

@ -144,7 +144,7 @@ Popup{
leftMargin: 15 leftMargin: 15
} }
} }
Loader{ FluLoader{
id:loader_next id:loader_next
property bool isEnd: control.index === steps.length-1 property bool isEnd: control.index === steps.length-1
sourceComponent: com_next_button sourceComponent: com_next_button
@ -155,7 +155,7 @@ Popup{
rightMargin: 15 rightMargin: 15
} }
} }
Loader{ FluLoader{
id:loader_prev id:loader_prev
visible: control.index !== 0 visible: control.index !== 0
sourceComponent: com_prev_button sourceComponent: com_prev_button

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

@ -86,7 +86,7 @@ Item {
ListView.onPooled: { ListView.onPooled: {
item_loader_container.item.pooled() item_loader_container.item.pooled()
} }
Loader{ FluLoader{
property var itemControl: item_control property var itemControl: item_control
property var itemModel: dataModel property var itemModel: dataModel
property int rowIndex: index property int rowIndex: index
@ -95,7 +95,7 @@ Item {
sourceComponent: com_item_container sourceComponent: com_item_container
} }
} }
Loader{ FluLoader{
id:loader_container id:loader_container
property var itemControl property var itemControl
property var itemModel property var itemModel
@ -357,7 +357,7 @@ Item {
} }
} }
Loader{ FluLoader{
id:item_loader_expand id:item_loader_expand
Layout.preferredWidth: 20 Layout.preferredWidth: 20
Layout.preferredHeight: 20 Layout.preferredHeight: 20
@ -381,7 +381,7 @@ Item {
} }
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
Loader{ FluLoader{
property var dataModel: itemModel property var dataModel: itemModel
property var itemMouse: item_mouse property var itemMouse: item_mouse
id:item_loader_cell id:item_loader_cell

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

@ -93,11 +93,11 @@ Window {
showStayTop: window.showStayTop showStayTop: window.showStayTop
} }
} }
Loader{ FluLoader{
anchors.fill: parent anchors.fill: parent
sourceComponent: background sourceComponent: background
} }
Loader{ FluLoader{
id: loader_title_bar id: loader_title_bar
anchors { anchors {
top: parent.top top: parent.top
@ -116,7 +116,7 @@ Window {
} }
clip: true clip: true
} }
Loader{ FluLoader{
property string loadingText: "加载中..." property string loadingText: "加载中..."
property bool cancel: false property bool cancel: false
id:loader_loading id:loader_loading