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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-10-15 16:29:50 +08:00
parent d805147627
commit 332c0ee54e
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/qml-Qt6/page/T_Expander.qml
View File

@ -58,6 +58,7 @@ FluScrollablePage{
width: parent.width width: parent.width
height: parent.height height: parent.height
contentWidth: width contentWidth: width
boundsBehavior: Flickable.StopAtBounds
contentHeight: text_info.height contentHeight: text_info.height
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
FluText{ FluText{

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

@ -59,6 +59,7 @@ FluScrollablePage{
width: parent.width width: parent.width
height: parent.height height: parent.height
contentWidth: width contentWidth: width
boundsBehavior: Flickable.StopAtBounds
contentHeight: text_info.height contentHeight: text_info.height
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
FluText{ FluText{

2
src/FluTreeModel.cpp
View File

@ -38,7 +38,7 @@ QVariant FluTreeModel::data(const QModelIndex &index, int role) const {
}; };
QHash<int, QByteArray> FluTreeModel::roleNames() const { QHash<int, QByteArray> FluTreeModel::roleNames() const {
return { {Qt::DisplayRole, "modelData"} }; return { {Qt::DisplayRole, "dataModel"} };
}; };
void FluTreeModel::setData(QList<Node*> data){ void FluTreeModel::setData(QList<Node*> data){

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

@ -1016,6 +1016,7 @@ Item {
} }
} }
anchors.fill: parent anchors.fill: parent
interactive: false
model:d.handleItems() model:d.handleItems()
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0 highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0

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

@ -88,7 +88,7 @@ Item {
} }
Loader{ Loader{
property var itemControl: item_control property var itemControl: item_control
property var itemModel: modelData property var itemModel: dataModel
property int rowIndex: index property int rowIndex: index
property bool isItemLoader: true property bool isItemLoader: true
id:item_loader_container id:item_loader_container
@ -395,7 +395,7 @@ Item {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
Loader{ Loader{
property var modelData: itemModel property var dataModel: itemModel
property var itemMouse: item_mouse property var itemMouse: item_mouse
id:item_loader_cell id:item_loader_cell
Layout.leftMargin: 10 Layout.leftMargin: 10
@ -417,7 +417,7 @@ Item {
width: item_text.width width: item_text.width
FluText { FluText {
id:item_text id:item_text
text: modelData.title text: dataModel.title
rightPadding: 14 rightPadding: 14
anchors.centerIn: parent anchors.centerIn: parent
color:{ color:{

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

@ -1017,6 +1017,7 @@ Item {
} }
} }
anchors.fill: parent anchors.fill: parent
interactive: false
model:d.handleItems() model:d.handleItems()
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0 highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0

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

@ -88,7 +88,7 @@ Item {
} }
Loader{ Loader{
property var itemControl: item_control property var itemControl: item_control
property var itemModel: modelData property var itemModel: dataModel
property int rowIndex: index property int rowIndex: index
property bool isItemLoader: true property bool isItemLoader: true
id:item_loader_container id:item_loader_container
@ -395,7 +395,7 @@ Item {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
Loader{ Loader{
property var modelData: itemModel property var dataModel: itemModel
property var itemMouse: item_mouse property var itemMouse: item_mouse
id:item_loader_cell id:item_loader_cell
Layout.leftMargin: 10 Layout.leftMargin: 10
@ -417,7 +417,7 @@ Item {
width: item_text.width width: item_text.width
FluText { FluText {
id:item_text id:item_text
text: modelData.title text: dataModel.title
rightPadding: 14 rightPadding: 14
anchors.centerIn: parent anchors.centerIn: parent
color:{ color:{