diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:01:17 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:01:18 +0200 |
commit | bdff4debf5f3f8125e3b7876bb5c62bc4251727f (patch) | |
tree | f347b458ce116f5ab798a04317cd156be1af0ad2 | |
parent | 56527b2f9efb59c4d7f90e3b50be957a15b20271 (diff) | |
parent | 3d44442331ba6f1ba7a5d5ad9f3834993911e288 (diff) | |
download | qtquickcontrols-bdff4debf5f3f8125e3b7876bb5c62bc4251727f.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I75d4dac714e023de38ec8f0327e42350f7e2a892
-rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 7 | ||||
-rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 | ||||
-rw-r--r-- | tests/auto/dialogs/data/DialogWithDynamicTitle.qml | 62 | ||||
-rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 16 |
4 files changed, 86 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 53050108..4f1d59f0 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -78,6 +78,8 @@ Item { scrollHelper.availableWidth = viewport.width scrollHelper.availableHeight = viewport.height blockUpdates = false; + hscrollbar.valueChanged(); + vscrollbar.valueChanged(); } } @@ -133,8 +135,11 @@ Item { anchors.leftMargin: leftMargin anchors.bottomMargin: bottomMargin onScrollAmountChanged: { + var scrollableAmount = scrollable ? scrollAmount : 0 if (flickableItem && (flickableItem.atXBeginning || flickableItem.atXEnd)) { - value = flickableItem.contentX - flickableItem.originX + value = Math.min(scrollableAmount, flickableItem.contentX - flickableItem.originX); + } else if (value > scrollableAmount) { + value = scrollableAmount; } } onValueChanged: { diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index ef6a9a1f..4ccc0f9d 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -322,6 +322,8 @@ void QQuickDialog1::setTitle(const QString &arg) { if (m_title != arg) { m_title = arg; + if (m_dialogWindow) + m_dialogWindow->setTitle(m_title); emit titleChanged(); } } diff --git a/tests/auto/dialogs/data/DialogWithDynamicTitle.qml b/tests/auto/dialogs/data/DialogWithDynamicTitle.qml new file mode 100644 index 00000000..806b6977 --- /dev/null +++ b/tests/auto/dialogs/data/DialogWithDynamicTitle.qml @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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.12 +import QtQuick.Controls 1.4 +import QtQuick.Dialogs 1.2 + +Dialog { + visible: true + property bool newTitle: false + function getTitle() { + return newTitle ? "New Title" : "Title"; + } + title: getTitle() +} diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index 58f23534..2ee81c9b 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -55,6 +55,7 @@ private slots: void dialogButtonHandler(); void dialogKeyHandler_data(); void dialogKeyHandler(); + void dialogWithDynamicTitle(); // FileDialog void fileDialogDefaultModality(); @@ -370,6 +371,21 @@ void tst_dialogs::fileDialogDefaultSuffix() QCOMPARE(dlg->property("defaultSuffix").toString(), QString()); } +void tst_dialogs::dialogWithDynamicTitle() +{ + QQmlEngine engine; + QQmlComponent component(&engine); + component.loadUrl(testFileUrl("DialogWithDynamicTitle.qml")); + QObject *dlg = component.create(); + QScopedPointer<QObject> cleanup(dlg); + QVERIFY2(dlg, qPrintable(component.errorString())); + QWindow *window = dlg->findChild<QWindow *>(); + QVERIFY(window); + QTRY_COMPARE(window->title(), QLatin1String("Title")); + dlg->setProperty("newTitle", true); + QTRY_COMPARE(window->title(), QLatin1String("New Title")); +} + QTEST_MAIN(tst_dialogs) #include "tst_dialogs.moc" |