summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoni Poikelin <joni.poikelin@theqtcompany.com>2016-01-13 09:28:30 +0200
committerJoni Poikelin <joni.poikelin@theqtcompany.com>2016-01-18 12:48:58 +0000
commit943247193cf976ec74e24533942efbd18ae261e0 (patch)
treeffbf3ef4c2a44c3f54a20c4028ec3515029bda5e
parentca2fa29fbcc013a46e9a8891ef1bd5a2c8a7c2b8 (diff)
downloadqtquickcontrols-943247193cf976ec74e24533942efbd18ae261e0.tar.gz
Fix regression with TableView header dragging when view is scrolled
Task-number: QTBUG-50432 Change-Id: Ieadc69219faa44d5c4e501c71a9b73013d5791b3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/Private/BasicTableView.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml
index 822086ee..66dec512 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 (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