diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-06-11 09:21:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-11 13:44:28 +0200 |
| commit | 68abb104e902454b8daba23b108c1ad89e33d890 (patch) | |
| tree | 42208e4135178bfd6eb2ce87c21ea19e8f2f781e | |
| parent | 5303f814746606a78198fec5c02746c2f3090460 (diff) | |
Fix TableView::positionViewAtRow()
Task-number: QTBUG-31631
Change-Id: Iaf5bd5c895f0fd94c7ffec19b571786ee9352782
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| -rw-r--r-- | src/controls/TableView.qml | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_tableview.qml | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 44aecfc20..6f05d605b 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -294,7 +294,7 @@ ScrollView { */ function positionViewAtRow(row, mode) { - listView.positionViewAtRow(row, mode) + listView.positionViewAtIndex(row, mode) } /*! diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 6779990c3..a54bbdcb3 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -395,6 +395,39 @@ TestCase { tableView.destroy() } + function test_positionViewAtRow() { + var test_instanceStr = + 'import QtQuick 2.1; \ + import QtQuick.Controls 1.0; \ + TableView { \ + TableViewColumn { \ + } \ + model: 1000; \ + headerVisible: false; \ + }' + + var table = Qt.createQmlObject(test_instanceStr, testCase, '') + waitForRendering(table) + + var beginPos = table.mapFromItem(table.viewport, 0, 0) + + table.positionViewAtRow(0, ListView.Beginning) + compare(table.rowAt(beginPos.x, beginPos.y), 0) + + table.positionViewAtRow(100, ListView.Beginning) + compare(table.rowAt(beginPos.x, beginPos.y), 100) + + var endPos = table.mapFromItem(table.viewport, 0, table.viewport.height - 1) + + table.positionViewAtRow(900, ListView.End) + compare(table.rowAt(endPos.x, endPos.y), 900) + + table.positionViewAtRow(999, ListView.End) + compare(table.rowAt(endPos.x, endPos.y), 999) + + table.destroy() + } + // In TableView, drawn text = table.__currentRowItem.children[1].children[1].itemAt(0).children[0].children[0].text function findAChild(item, name) |