From cf957e407030fc260bd86882cf2f79724126abdd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 8 Nov 2018 11:27:32 +0100 Subject: Bump version Change-Id: I0947415f129a3076d8d69b8f47cb0e55968291bc --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 473c6623..36da0899 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.11.2 +MODULE_VERSION = 5.11.3 -- cgit v1.2.1 From 10b3bffbd21b6265a3d124f310c99fcbac2b027f Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 19 Oct 2018 11:51:39 +0200 Subject: TableView: Handle dynamic insertion of TableViewColumns correctly When inserting a TableViewColumn after the TableView is created, then it needs to be inserted into the list of columns at the specified index so that it responds correctly to things like resizeColumnsToContents() Fixes: QTBUG-58594 Change-Id: If7ff545306fe8b6616d8e016eb87e565ed40c836 Reviewed-by: Frederik Gladhorn --- src/controls/Private/BasicTableView.qml | 11 ++++ .../data/tableview/table_resizedynamiccolumns.qml | 75 ++++++++++++++++++++++ tests/auto/controls/data/tst_tableview.qml | 15 +++++ 3 files changed, 101 insertions(+) create mode 100644 tests/auto/controls/data/tableview/table_resizedynamiccolumns.qml diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 2557dca7..1f846b57 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -260,6 +260,17 @@ ScrollView { if (index >= 0 && index <= columnCount && object.Accessible.role === Accessible.ColumnHeader) { object.__view = root columnModel.insert(index, {columnItem: object}) + if (root.__columns[index] !== object) { + // The new column needs to be put into __columns at the specified index + // so the list needs to be recreated to be correct + var arr = [] + for (var i = 0; i < index; ++i) + arr.push(root.__columns[i]) + arr.push(object) + for (i = index; i < root.__columns.length; ++i) + arr.push(root.__columns[i]) + root.__columns = arr + } return object } diff --git a/tests/auto/controls/data/tableview/table_resizedynamiccolumns.qml b/tests/auto/controls/data/tableview/table_resizedynamiccolumns.qml new file mode 100644 index 00000000..d11bce97 --- /dev/null +++ b/tests/auto/controls/data/tableview/table_resizedynamiccolumns.qml @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtQuick.Controls 1.2 + +TableView { + id: tableView + Component { + id: columnComponentWithDelegate + TableViewColumn { + delegate: Rectangle { + implicitWidth: 50 + height: 10 + color: "red" + } + } + } + Component { + id: columnComponent + TableViewColumn { } + } + Component.onCompleted: { + addColumn(columnComponentWithDelegate.createObject(tableView, { title: "rects", width: 20 })); + addColumn(columnComponent.createObject(tableView, { title: "numbers" })); + } + model: 10 +} diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index fe50f241..08bf1d9d 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -1131,5 +1131,20 @@ TestCase { tableView.moveColumn(0, 1); compare(tableView.sortIndicatorColumn, 1); } + + function test_resize_dynamic_columns() { + var component = Qt.createComponent("tableview/table_resizedynamiccolumns.qml") + compare(component.status, Component.Ready) + var table = createTemporaryObject(component, container); + verify(table !== null, "table created is null") + waitForRendering(table) + compare(table.getColumn(0).width, 20) + table.getColumn(0).resizeToContents() + tryCompare(table.getColumn(0), "width", 50) + table.getColumn(0).width = 20 + compare(table.getColumn(0).width, 20) + table.resizeColumnsToContents() + compare(table.getColumn(0).width, 50) + } } } -- cgit v1.2.1