summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoni Poikelin <joni.poikelin@qt.io>2017-09-05 12:42:37 +0300
committerShawn Rutledge <shawn.rutledge@qt.io>2019-01-28 12:51:17 +0000
commit352aeb96a52590aff91e3f6a1e03c65418d596d3 (patch)
tree2ae4011a58a23e628bd5b02bada4e164a35e1c91
parente08c67ef5b5ac41f31c6140f2d1e67ee22222f65 (diff)
downloadqtquickcontrols-352aeb96a52590aff91e3f6a1e03c65418d596d3.tar.gz
Fix TableView column index when columns are inserted
Task-number: QTBUG-63001 Change-Id: I91c3e856bba8f5a4cfe9b09574213fe6e0f5c23d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/controls/Private/BasicTableView.qml2
-rw-r--r--src/controls/Private/TableViewItemDelegateLoader.qml2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml
index 1f846b57..c701883b 100644
--- a/src/controls/Private/BasicTableView.qml
+++ b/src/controls/Private/BasicTableView.qml
@@ -341,7 +341,6 @@ ScrollView {
var col = getColumn(i)
var header = __listView.headerItem.headerRepeater.itemAt(i)
if (col) {
- col.__index = i
col.resizeToContents()
if (col.width < header.implicitWidth)
col.width = header.implicitWidth
@@ -613,7 +612,6 @@ ScrollView {
onItemAdded: {
var columnItem = columnModel.get(index).columnItem
- item.__index = index
item.__rowItem = rowitem
item.__column = columnItem
}
diff --git a/src/controls/Private/TableViewItemDelegateLoader.qml b/src/controls/Private/TableViewItemDelegateLoader.qml
index 462a2bb4..c5c6584a 100644
--- a/src/controls/Private/TableViewItemDelegateLoader.qml
+++ b/src/controls/Private/TableViewItemDelegateLoader.qml
@@ -71,7 +71,7 @@ Loader {
: __column && __column.delegate ? __column.delegate : __itemDelegate
// All these properties are internal
- property int __index
+ property int __index: index
property Item __rowItem: null
property var __model: __rowItem ? __rowItem.itemModel : undefined
property var __modelData: __rowItem ? __rowItem.itemModelData : undefined