diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:02:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:02:06 +0200 |
| commit | a69544a7b444301c1d3f7956c89eb65ea0b3ab83 (patch) | |
| tree | 979de669a8c29a92337c358f42fe29b36bc5c2b4 /src/controls/TreeView.qml | |
| parent | 0f3d4118e607a6b8b4d1090489a2277f33019a05 (diff) | |
| parent | e9ad3352df0815761c1fde8ea36b040e8431f360 (diff) | |
| download | qtquickcontrols-a69544a7b444301c1d3f7956c89eb65ea0b3ab83.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
Diffstat (limited to 'src/controls/TreeView.qml')
| -rw-r--r-- | src/controls/TreeView.qml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/controls/TreeView.qml b/src/controls/TreeView.qml index 6a38acff..2bedb9e6 100644 --- a/src/controls/TreeView.qml +++ b/src/controls/TreeView.qml @@ -49,7 +49,7 @@ BasicTableView { property var model: null property alias rootIndex: modelAdaptor.rootIndex - readonly property var currentIndex: modelAdaptor.mapRowToModelIndex(__currentRow) + readonly property var currentIndex: modelAdaptor.updateCount, modelAdaptor.mapRowToModelIndex(__currentRow) property ItemSelectionModel selection: null signal activated(var index) @@ -96,6 +96,12 @@ BasicTableView { id: modelAdaptor model: root.model + // Hack to force re-evaluation of the currentIndex binding + property int updateCount: 0 + onModelReset: updateCount++ + onRowsInserted: updateCount++ + onRowsRemoved: updateCount++ + onExpanded: root.expanded(index) onCollapsed: root.collapsed(index) } |