diff --git a/example/qml-Qt6/page/T_Expander.qml b/example/qml-Qt6/page/T_Expander.qml index 36f390e3..dc5d2854 100644 --- a/example/qml-Qt6/page/T_Expander.qml +++ b/example/qml-Qt6/page/T_Expander.qml @@ -58,6 +58,7 @@ FluScrollablePage{ width: parent.width height: parent.height contentWidth: width + boundsBehavior: Flickable.StopAtBounds contentHeight: text_info.height ScrollBar.vertical: FluScrollBar {} FluText{ diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml index 5b5f45a4..0dac42be 100644 --- a/example/qml/page/T_Expander.qml +++ b/example/qml/page/T_Expander.qml @@ -59,6 +59,7 @@ FluScrollablePage{ width: parent.width height: parent.height contentWidth: width + boundsBehavior: Flickable.StopAtBounds contentHeight: text_info.height ScrollBar.vertical: FluScrollBar {} FluText{ diff --git a/src/FluTreeModel.cpp b/src/FluTreeModel.cpp index 5dbbb7e3..872d944c 100644 --- a/src/FluTreeModel.cpp +++ b/src/FluTreeModel.cpp @@ -38,7 +38,7 @@ QVariant FluTreeModel::data(const QModelIndex &index, int role) const { }; QHash FluTreeModel::roleNames() const { - return { {Qt::DisplayRole, "modelData"} }; + return { {Qt::DisplayRole, "dataModel"} }; }; void FluTreeModel::setData(QList data){ diff --git a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml index 93a2c1ae..5f90472a 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml @@ -1016,6 +1016,7 @@ Item { } } anchors.fill: parent + interactive: false model:d.handleItems() boundsBehavior: ListView.StopAtBounds highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0 diff --git a/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml index ed99c3d8..ee9be523 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml @@ -88,7 +88,7 @@ Item { } Loader{ property var itemControl: item_control - property var itemModel: modelData + property var itemModel: dataModel property int rowIndex: index property bool isItemLoader: true id:item_loader_container @@ -395,7 +395,7 @@ Item { Layout.alignment: Qt.AlignVCenter } Loader{ - property var modelData: itemModel + property var dataModel: itemModel property var itemMouse: item_mouse id:item_loader_cell Layout.leftMargin: 10 @@ -417,7 +417,7 @@ Item { width: item_text.width FluText { id:item_text - text: modelData.title + text: dataModel.title rightPadding: 14 anchors.centerIn: parent color:{ diff --git a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml index 4c390207..b2ba8d5f 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml @@ -1017,6 +1017,7 @@ Item { } } anchors.fill: parent + interactive: false model:d.handleItems() boundsBehavior: ListView.StopAtBounds highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0 diff --git a/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml index 76a16a23..b999fd73 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml @@ -88,7 +88,7 @@ Item { } Loader{ property var itemControl: item_control - property var itemModel: modelData + property var itemModel: dataModel property int rowIndex: index property bool isItemLoader: true id:item_loader_container @@ -395,7 +395,7 @@ Item { Layout.alignment: Qt.AlignVCenter } Loader{ - property var modelData: itemModel + property var dataModel: itemModel property var itemMouse: item_mouse id:item_loader_cell Layout.leftMargin: 10 @@ -417,7 +417,7 @@ Item { width: item_text.width FluText { id:item_text - text: modelData.title + text: dataModel.title rightPadding: 14 anchors.centerIn: parent color:{