diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
| commit | ad964dd36a56dcd071bb3527ee4957c607365cce (patch) | |
| tree | 1e916348677fa8ca974916b9f3e3fcb3a55d3b48 /src/controls/Private/BasicTableView.qml | |
| parent | e42603fd5b4efaa321dfc4417905510beafe288e (diff) | |
| parent | 148faf6278186986d1ca6afcdea0c361bcbf199e (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/controls/qquickmenubar.cpp
Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
Diffstat (limited to 'src/controls/Private/BasicTableView.qml')
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 822086eee..afec226d5 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -677,7 +677,7 @@ ScrollView { onPositionChanged: { if (drag.active && modelData.movable && pressed && columnCount > 1) { // only do this while dragging for (var h = columnCount-1 ; h >= 0 ; --h) { - if (drag.target.x + listView.contentX + headerRowDelegate.width/2 > headerRow.children[h].x) { + if (headerRow.children[h].visible && drag.target.x + headerRowDelegate.width/2 > headerRow.children[h].x) { repeater.targetIndex = h break } @@ -715,7 +715,7 @@ ScrollView { } parent: tableHeader x: __implicitX - property double __implicitX: headerRowDelegate.x - listView.contentX + property double __implicitX: headerRowDelegate.x width: modelData.width height: parent.height sourceComponent: root.headerDelegate |