StackLayout: propagate rearrange() call to child layouts
Task-number: QTBUG-57867 Change-Id: I0190b892e2bc2966b82a0dbd99e53fd9d6848957 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
Oleg Yadrov
parent
94324a4ea2
commit
03505d6eb7
|
|
@ -307,7 +307,11 @@ void QQuickStackLayout::rearrange(const QSizeF &newSize)
|
||||||
QQuickItem *item = itemAt(d->currentIndex);
|
QQuickItem *item = itemAt(d->currentIndex);
|
||||||
Q_ASSERT(item);
|
Q_ASSERT(item);
|
||||||
item->setPosition(QPointF(0,0)); // ### respect alignment?
|
item->setPosition(QPointF(0,0)); // ### respect alignment?
|
||||||
item->setSize(newSize.expandedTo(hints.min()).boundedTo(hints.max()));
|
const QSizeF oldSize(item->width(), item->height());
|
||||||
|
const QSizeF effectiveNewSize = newSize.expandedTo(hints.min()).boundedTo(hints.max());
|
||||||
|
item->setSize(effectiveNewSize);
|
||||||
|
if (effectiveNewSize == oldSize)
|
||||||
|
item->polish();
|
||||||
QQuickLayout::rearrange(newSize);
|
QQuickLayout::rearrange(newSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,107 @@
|
||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2016 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 QtTest 1.0
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: container
|
||||||
|
width: 200
|
||||||
|
height: 200
|
||||||
|
TestCase {
|
||||||
|
id: testCase
|
||||||
|
name: "Tests_StackLayout"
|
||||||
|
when: windowShown
|
||||||
|
width: 200
|
||||||
|
height: 200
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: layout_rearrange_Component
|
||||||
|
|
||||||
|
StackLayout {
|
||||||
|
width: 640
|
||||||
|
height: 480
|
||||||
|
|
||||||
|
property alias testRectangle: testRectangle
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
Layout.preferredHeight: 100
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: testRectangle
|
||||||
|
Layout.preferredWidth: 100
|
||||||
|
Layout.preferredHeight: 100
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function test_rearrange()
|
||||||
|
{
|
||||||
|
var layout = layout_rearrange_Component.createObject(container)
|
||||||
|
compare(layout.testRectangle.x, 0)
|
||||||
|
layout.testRectangle.visible = true
|
||||||
|
tryCompare(layout.testRectangle, "x", 100)
|
||||||
|
|
||||||
|
layout.destroy()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -9,5 +9,6 @@ TESTDATA = data/*
|
||||||
|
|
||||||
OTHER_FILES += \
|
OTHER_FILES += \
|
||||||
data/tst_rowlayout.qml \
|
data/tst_rowlayout.qml \
|
||||||
data/tst_gridlayout.qml
|
data/tst_gridlayout.qml \
|
||||||
|
data/tst_stacklayout.qml
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue