qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/quickcontrols/controls/data/tst_combobox.qml

2368 lines
83 KiB
QML
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-05-13 13:12:05 +00:00
// Copyright (C) 2017 The Qt Company Ltd.
Correct license for test files According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-02-22 14:51:16 +00:00
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Remove all version numbers from QML imports As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-03-26 16:01:51 +00:00
import QtQuick
import QtQuick.Window
import QtTest
import QtQuick.Controls
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
import Qt.test.controls
[autotest] Fix ComboBox::test_font() for macOS style macOS style does not support a different font than the default system font. Task-number: QTBUG-95678 Change-Id: Ib06118920e9cc6fcdc2af3ab34d76a4bc347a3d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2021-10-20 14:07:00 +00:00
import QtQuick.NativeStyle as NativeStyle
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
TestCase {
id: testCase
tst_combobox: use larger window test_down() needs to place the popup below the combobox button to be able to test its pressed and down states while the popup is open. On some high DPI displays (Chromebook Pixel) the popup did not fit fully below, but got pushed partly over the button. Consequently, mouse presses went to the popup instead of the button and the test failed. Change-Id: I03e5768e00cf1eaf6d704a16ffe2b8d1705021b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-04 08:47:50 +00:00
width: 400
height: 400
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
visible: true
when: windowShown
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
name: "ComboBox"
Fix ComboBox to scroll to the highlighted item Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-10-01 21:02:43 +00:00
Component {
id: signalSpy
SignalSpy { }
}
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Component {
id: comboBox
Fix ComboBox to scroll to the highlighted item Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-10-01 21:02:43 +00:00
ComboBox { }
}
Component {
id: emptyBox
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
ComboBox {
delegate: ItemDelegate {
QQuickComboBox: ensure a parent for delegates This allows us to replace the "width: control.popup.width" expressions with "width: parent.width" to avoid explicit references to the popup. Next, we are ready to defer the execution of the popup until it becomes visible or is accessed by the user. Without the parent item fix, ComboBox throws an error: ComboBox.qml:58: TypeError: Cannot read property of null ...and tst_snippets fails => tested implicitly. :) Change-Id: Ib9cfcf7558addbe3403d835d3ae11b6c11c2f0cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2016-11-04 15:45:17 +00:00
width: parent.width
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
}
}
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
Component {
id: mouseArea
MouseArea { }
}
QQuickComboBox: don't hide popup if focused The ComboBox popup should be closed when the ComboBox loses focus, but not if the control gaining focus is the popup itself. While all the styles implemented in this module implement the ComboBox popup as an unfocusable window and handle all the keyboard events in QQuickComboBox itself, the developer can choose to replace the popup with a custom implementation, which might need the keyboard focus. Fixes: QTBUG-74661 Change-Id: I838ab9cb697df63ea2099e68f1ae99eadb06be08 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-03-24 19:54:31 +00:00
Component {
id: customPopup
Popup {
width: 100
implicitHeight: contentItem.implicitHeight
contentItem: TextInput {
anchors.fill: parent
}
}
}
Add a test for having a ShaderEffect as a delegate Change-Id: If4f3dca99638015b479509e4aa73e0190b1182ac Task-number: QTBUG-67343 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-05-22 13:40:06 +00:00
Component {
id: comboBoxWithShaderEffect
ComboBox {
delegate: Rectangle {
Text {
id: txt
anchors.centerIn: parent
text: "item" + index
font.pixelSize: 20
color: "red"
}
id: rect
objectName: "rect"
width: parent.width
height: txt.implicitHeight
gradient: Gradient {
GradientStop { color: "lightsteelblue"; position: 0.0 }
GradientStop { color: "blue"; position: 1.0 }
}
layer.enabled: true
layer.effect: ShaderEffect {
objectName: "ShaderFX"
width: rect.width
height: rect.height
Fix shader warnings in ComboBox::test_comboBoxWithShaderEffect Use the build system to generate the qsb file. Fixes: QTBUG-125580 Pick-to: 6.5 6.7 6.8 Change-Id: Iefc910356a931109b9c4b60eda1ca145bc3c5079 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-08-12 07:24:10 +00:00
fragmentShader: "qrc:/data/combobox/shader.frag.qsb"
Add a test for having a ShaderEffect as a delegate Change-Id: If4f3dca99638015b479509e4aa73e0190b1182ac Task-number: QTBUG-67343 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-05-22 13:40:06 +00:00
}
}
}
}
Attempt to fix tst_controls::ComboBox flakiness QQuickWindowPrivate::flushFrameSynchronousEvents() is a real trouble maker in auto tests, because it keeps delivering spurious hover events based on the last mouse position from earlier test functions and test cases. Task-number: QTBUG-61225 Change-Id: I5a8d40a01e3919033f74b26357505f2b514a3281 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-04 07:36:56 +00:00
function init() {
Remove flushFrameSynchronousEvents from qquickwindow_p.h Change-Id: Ib1ae19eac2a5a95b71345b80075f871ea82fa928 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-06-28 10:55:41 +00:00
// QTBUG-61225: Move the mouse away to avoid QQuickDeliveryAgentPrivate::flushFrameSynchronousEvents()
Attempt to fix tst_controls::ComboBox flakiness QQuickWindowPrivate::flushFrameSynchronousEvents() is a real trouble maker in auto tests, because it keeps delivering spurious hover events based on the last mouse position from earlier test functions and test cases. Task-number: QTBUG-61225 Change-Id: I5a8d40a01e3919033f74b26357505f2b514a3281 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-04 07:36:56 +00:00
// delivering interfering hover events based on the last mouse position from earlier tests. For
// example, ComboBox::test_activation() kept receiving hover events for the last mouse position
// from CheckDelegate::test_checked().
mouseMove(testCase, testCase.width - 1, testCase.height - 1)
}
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
function test_defaults() {
Fail on warnings for simple "default" controls tests This patch: - Adds a simple, "default-constructed" (i.e. little or no properties set) test function for each control where one was missing. - Causes those tests to fail on any warning. It would be simpler to just call failOnWarnings(/.?/) in the initTestCase() of each test, but there are too marning warnings to fix right now. Task-number: QTBUG-98718 Change-Id: Ia3aa901feab5db534925824528caf25297e02760 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-25 08:11:57 +00:00
failOnWarning(/.?/)
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
compare(control.count, 0)
compare(control.model, undefined)
Add ComboBox::flat [ChangeLog][ComboBox] Added a flat property that provides more suitable looks for using ComboBox in a ToolBar. Task-number: QTBUG-54935 Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-09 11:42:56 +00:00
compare(control.flat, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
compare(control.pressed, false)
compare(control.currentIndex, -1)
compare(control.highlightedIndex, -1)
compare(control.currentText, "")
verify(control.delegate)
tst_combobox: skip indicator check for the native styles The ComboBox::test_defaults() test checks that there is an indictor present in the style. But for the native styles, the indicator is drawn as a part of the background. So skip the failing test when running on mac and windows. Task-number: QTBUG-95678 Pick-to: 6.2 Change-Id: I35f1900044bad1a519d9883b2061810bff8eb7a8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
2021-08-30 14:13:06 +00:00
if (Qt.platform.pluginName !== "cocoa" && Qt.platform.pluginName !== "windows") {
// Only the non-native styles sets an indicator delegate. The native
// styles will instead draw the indicator as a part of the background.
verify(control.indicator)
}
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
verify(control.popup)
QQuickComboBox: fix acceptableInput being wrong if no validator was set This patch fixes an issue with hasAcceptableInput(), if the property would be read before the contentItem had been set by the qml engine. This would cause hasAcceptableInput to return false by default, even though the default value is supposed to be true, if no validators or inputMasks are being used. The solution that I've chosen, is to give the QQuickComboBox its own acceptableInput variable, and connect the contentItem's acceptableInputChanged() signal to a function that polls for the contentItem property, and updates its variable accordingly. Fixes: QTBUG-94307 Pick-to: 6.2 6.1 5.15 Change-Id: I587d76162e75544a7ed1df9e3b9104bd73013bb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-06-11 12:06:57 +00:00
verify(control.acceptableInput)
Combobox: Fix initial set of inputMethodHints Fix for setting up initial inputMethodHints to Qt::ImhNoPredictiveText for Combobox. Before this change, Qt::ImhNoPredictiveText was never set for Combobox. As inputMethodHints() by default returns Qt::ImhNoPredictiveText value, setInputMethodHints didn't allow to set this value correctly. Task-number: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: Ie4ec0d32fff7586bc3a8bd055b752000c0330fad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-01-21 10:04:55 +00:00
compare(control.inputMethodHints, Qt.ImhNoPredictiveText)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
function test_array() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
var items = [ "Banana", "Apple", "Coconut" ]
control.model = items
compare(control.model, items)
compare(control.count, 3)
compare(control.currentIndex, 0)
compare(control.currentText, "Banana")
control.currentIndex = 2
compare(control.currentIndex, 2)
compare(control.currentText, "Coconut")
control.model = null
compare(control.model, null)
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(control.currentText, "")
}
ComboBox: add support for object array Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 16:06:30 +00:00
function test_objects() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(emptyBox, testCase)
ComboBox: add support for object array Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 16:06:30 +00:00
verify(control)
var items = [
{ text: "Apple" },
{ text: "Orange" },
{ text: "Banana" }
]
control.model = items
compare(control.model, items)
compare(control.count, 3)
compare(control.currentIndex, 0)
compare(control.currentText, "Apple")
control.currentIndex = 2
compare(control.currentIndex, 2)
compare(control.currentText, "Banana")
control.model = null
compare(control.model, null)
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(control.currentText, "")
}
ComboBox: fix QObject list value models When ComboBox::model is bound to a QObjectList property, the effective type of the model is QVariant(QQmlListReference) and things work as expected. When a similar QObjectList is constructed by hand in JS, or returned from an invokable method, the effective type of the model is QVariantList(QObjectStar) instead. In this scenario, we have to help QQuickComboBoxDelegateModel::stringValue() to lookup the property that matches the given textRole. Change-Id: Ib44c912cf647e1cd98c5608436427d31caf80d97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-12 09:11:38 +00:00
function test_qobjects() {
var control = createTemporaryObject(emptyBox, testCase, {textRole: "text"})
verify(control)
Remove all version numbers from QML imports As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-03-26 16:01:51 +00:00
var obj1 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'one' }", control)
var obj2 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'two' }", control)
var obj3 = Qt.createQmlObject("import QtQml; QtObject { property string text: 'three' }", control)
ComboBox: fix QObject list value models When ComboBox::model is bound to a QObjectList property, the effective type of the model is QVariant(QQmlListReference) and things work as expected. When a similar QObjectList is constructed by hand in JS, or returned from an invokable method, the effective type of the model is QVariantList(QObjectStar) instead. In this scenario, we have to help QQuickComboBoxDelegateModel::stringValue() to lookup the property that matches the given textRole. Change-Id: Ib44c912cf647e1cd98c5608436427d31caf80d97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-12 09:11:38 +00:00
control.model = [obj1, obj2, obj3]
compare(control.count, 3)
compare(control.currentIndex, 0)
compare(control.currentText, "one")
control.currentIndex = 2
compare(control.currentIndex, 2)
compare(control.currentText, "three")
control.model = null
compare(control.model, null)
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(control.currentText, "")
}
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
function test_number() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
control.model = 10
compare(control.model, 10)
compare(control.count, 10)
compare(control.currentIndex, 0)
compare(control.currentText, "0")
control.currentIndex = 9
compare(control.currentIndex, 9)
compare(control.currentText, "9")
control.model = 0
compare(control.model, 0)
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(control.currentText, "")
}
ListModel {
id: listmodel
ListElement { text: "First" }
ListElement { text: "Second" }
ListElement { text: "Third" }
ListElement { text: "Fourth" }
ListElement { text: "Fifth" }
}
function test_listModel() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
control.model = listmodel
compare(control.model, listmodel)
compare(control.count, 5)
compare(control.currentIndex, 0)
compare(control.currentText, "First")
control.currentIndex = 2
compare(control.currentIndex, 2)
compare(control.currentText, "Third")
control.model = undefined
compare(control.model, undefined)
compare(control.count, 0)
compare(control.currentIndex, -1)
compare(control.currentText, "")
}
ListModel {
id: fruitmodel
ListElement { name: "Apple"; color: "red" }
ListElement { name: "Orange"; color: "orange" }
ListElement { name: "Banana"; color: "yellow" }
}
ComboBox: fix currentValue not being updated on model changes Make sure we call updateCurrentValue() where necessary. Fixes: QTBUG-83554 Pick-to: 5.15 Change-Id: Iad593c2fc094a26429de1eda91bbdb152ffee2c2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-05-11 13:45:31 +00:00
Component {
id: fruitModelComponent
ListModel {
ListElement { name: "Apple"; color: "red" }
ListElement { name: "Orange"; color: "orange" }
ListElement { name: "Banana"; color: "yellow" }
}
}
ComboBox: add support for object array Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 16:06:30 +00:00
property var fruitarray: [
{ name: "Apple", color: "red" },
{ name: "Orange", color: "orange" },
{ name: "Banana", color: "yellow" }
]
ComboBox: fix currentValue not being updated on model changes Make sure we call updateCurrentValue() where necessary. Fixes: QTBUG-83554 Pick-to: 5.15 Change-Id: Iad593c2fc094a26429de1eda91bbdb152ffee2c2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-05-11 13:45:31 +00:00
Component {
id: birdModelComponent
ListModel {
ListElement { name: "Galah"; color: "pink" }
ListElement { name: "Kookaburra"; color: "brown" }
ListElement { name: "Magpie"; color: "black" }
}
}
ComboBox: add support for object array Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 16:06:30 +00:00
function test_textRole_data() {
return [
{ tag: "ListModel", model: fruitmodel },
{ tag: "ObjectArray", model: fruitarray }
]
}
function test_textRole(data) {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(emptyBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
ComboBox: add support for object array Change-Id: Ia43ba18cfd7ce9f5c4c28e239645320af5ba41e7 Task-number: QTBUG-50141 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 16:06:30 +00:00
control.model = data.model
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
compare(control.count, 3)
compare(control.currentIndex, 0)
compare(control.currentText, "")
control.textRole = "name"
compare(control.currentText, "Apple")
control.textRole = "color"
compare(control.currentText, "red")
control.currentIndex = 1
compare(control.currentIndex, 1)
compare(control.currentText, "orange")
control.textRole = "name"
compare(control.currentText, "Orange")
control.textRole = ""
compare(control.currentText, "")
}
function test_textAt() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
control.model = ["Apple", "Orange", "Banana"]
compare(control.textAt(0), "Apple")
compare(control.textAt(1), "Orange")
compare(control.textAt(2), "Banana")
compare(control.textAt(-1), "") // TODO: null?
compare(control.textAt(5), "") // TODO: null?
}
function test_find_data() {
return [
{ tag: "Banana (MatchExactly)", term: "Banana", flags: Qt.MatchExactly, index: 0 },
{ tag: "banana (MatchExactly)", term: "banana", flags: Qt.MatchExactly, index: 1 },
{ tag: "bananas (MatchExactly)", term: "bananas", flags: Qt.MatchExactly, index: -1 },
{ tag: "Cocomuffin (MatchExactly)", term: "Cocomuffin", flags: Qt.MatchExactly, index: 4 },
Remove the remaining usages of QRegExp and QRegExpValidator Change-Id: Iab8e682eeb43b3403eba37f7decb7f7a494ae361 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 15:49:13 +00:00
{ tag: "b(an)+a (MatchRegularExpression)", term: "B(an)+a", flags: Qt.MatchRegularExpression, index: 0 },
{ tag: "b(an)+a (MatchRegularExpression|MatchCaseSensitive)", term: "b(an)+a", flags: Qt.MatchRegularExpression | Qt.MatchCaseSensitive, index: 1 },
{ tag: "[coc]+\\w+ (MatchRegularExpression)", term: "[coc]+\\w+", flags: Qt.MatchRegularExpression, index: 2 },
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
{ tag: "?pp* (MatchWildcard)", term: "?pp*", flags: Qt.MatchWildcard, index: 3 },
{ tag: "app* (MatchWildcard|MatchCaseSensitive)", term: "app*", flags: Qt.MatchWildcard | Qt.MatchCaseSensitive, index: -1 },
{ tag: "Banana (MatchFixedString)", term: "Banana", flags: Qt.MatchFixedString, index: 0 },
{ tag: "banana (MatchFixedString|MatchCaseSensitive)", term: "banana", flags: Qt.MatchFixedString | Qt.MatchCaseSensitive, index: 1 },
{ tag: "coco (MatchStartsWith)", term: "coco", flags: Qt.MatchStartsWith, index: 2 },
{ tag: "coco (MatchStartsWith|MatchCaseSensitive)", term: "coco", flags: Qt.StartsWith | Qt.MatchCaseSensitive, index: -1 },
{ tag: "MUFFIN (MatchEndsWith)", term: "MUFFIN", flags: Qt.MatchEndsWith, index: 4 },
{ tag: "MUFFIN (MatchEndsWith|MatchCaseSensitive)", term: "MUFFIN", flags: Qt.MatchEndsWith | Qt.MatchCaseSensitive, index: -1 },
{ tag: "Con (MatchContains)", term: "Con", flags: Qt.MatchContains, index: 2 },
{ tag: "Con (MatchContains|MatchCaseSensitive)", term: "Con", flags: Qt.MatchContains | Qt.MatchCaseSensitive, index: -1 },
]
}
function test_find(data) {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
control.model = ["Banana", "banana", "Coconut", "Apple", "Cocomuffin"]
compare(control.find(data.term, data.flags), data.index)
}
Add valueRole API to ComboBox This allows the user to conveniently manage data for a role associated with the text role. A common example of this is an enum stored in a backend with nicely formatted text displayed to the user. Before this patch, developers would have to write code like this: ComboBox { textRole: "text" onActivated: backend.modifier = model[currentIndex].value Component.onCompleted: currentIndex = findValue(backend.modifier) model: [ { value: Qt.NoModifier, text: qsTr("No modifier") }, { value: Qt.ShiftModifier, text: qsTr("Shift") }, { value: Qt.ControlModifier, text: qsTr("Control") } ] function findValue(value) { for (var i = 0; i < model.length; ++i) { if (model[i].value === value) return i } return -1 } } With this patch, the code becomes much simpler: ComboBox { textRole: "text" valueRole: "value" onActivated: backend.modifier = currentValue Component.onCompleted: currentIndex = indexOfValue(backend.modifier) model: [ { value: Qt.NoModifier, text: qsTr("No modifier") }, { value: Qt.ShiftModifier, text: qsTr("Shift") }, { value: Qt.ControlModifier, text: qsTr("Control") } ] } [ChangeLog][Controls][ComboBox] Added valueRole, currentValue and indexOfValue(). These allow convenient management of data for a role associated with the text role. Change-Id: I0ed19bd0ba9cf6b044a8113ff1a8782d43065449 Fixes: QTBUG-73491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-03-04 10:12:05 +00:00
function test_valueRole_data() {
return [
{ tag: "ListModel", model: fruitmodel },
{ tag: "ObjectArray", model: fruitarray }
]
}
function test_valueRole(data) {
var control = createTemporaryObject(emptyBox, testCase,
{ model: data.model, valueRole: "color" })
verify(control)
compare(control.count, 3)
compare(control.currentIndex, 0)
compare(control.currentValue, "red")
control.valueRole = "name"
compare(control.currentValue, "Apple")
control.currentIndex = 1
compare(control.currentIndex, 1)
compare(control.currentValue, "Orange")
control.valueRole = "color"
compare(control.currentValue, "orange")
control.model = null
compare(control.currentIndex, -1)
// An invalid QVariant is represented as undefined.
compare(control.currentValue, undefined)
control.valueRole = ""
compare(control.currentValue, undefined)
}
function test_valueAt() {
var control = createTemporaryObject(comboBox, testCase,
{ model: fruitmodel, textRole: "name", valueRole: "color" })
verify(control)
compare(control.valueAt(0), "red")
compare(control.valueAt(1), "orange")
compare(control.valueAt(2), "yellow")
compare(control.valueAt(-1), undefined)
compare(control.valueAt(5), undefined)
}
function test_indexOfValue_data() {
return [
{ tag: "red", expectedIndex: 0 },
{ tag: "orange", expectedIndex: 1 },
{ tag: "yellow", expectedIndex: 2 },
{ tag: "brown", expectedIndex: -1 },
]
}
function test_indexOfValue(data) {
var control = createTemporaryObject(comboBox, testCase,
{ model: fruitmodel, textRole: "name", valueRole: "color" })
verify(control)
compare(control.indexOfValue(data.tag), data.expectedIndex)
}
ComboBox: fix currentValue not being updated on model changes Make sure we call updateCurrentValue() where necessary. Fixes: QTBUG-83554 Pick-to: 5.15 Change-Id: Iad593c2fc094a26429de1eda91bbdb152ffee2c2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-05-11 13:45:31 +00:00
function test_currentValueAfterModelChanged() {
let fruitModel = createTemporaryObject(fruitModelComponent, testCase)
verify(fruitModel)
let control = createTemporaryObject(comboBox, testCase,
{ model: fruitModel, textRole: "name", valueRole: "color", currentIndex: 1 })
verify(control)
compare(control.currentText, "Orange")
compare(control.currentValue, "orange")
// Remove "Apple"; the current item should now be "Banana", so currentValue should be "yellow".
fruitModel.remove(0)
compare(control.currentText, "Banana")
compare(control.currentValue, "yellow")
}
function test_currentValueAfterNewModelSet() {
let control = createTemporaryObject(comboBox, testCase,
{ model: fruitmodel, textRole: "name", valueRole: "color", currentIndex: 0 })
verify(control)
compare(control.currentText, "Apple")
compare(control.currentValue, "red")
// Swap the model out entirely. Since the currentIndex was 0 and
// is reset to 0 when a new model is set, it remains 0.
let birdModel = createTemporaryObject(birdModelComponent, testCase)
verify(birdModel)
control.model = birdModel
compare(control.currentText, "Galah")
compare(control.currentValue, "pink")
}
tst_combobox: test both Window and ApplicationWindow Change-Id: Ic6dd06fc7826cb02ad8b258874dccb4937919c15 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-31 07:32:42 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
function test_arrowKeys() {
Add valueRole API to ComboBox This allows the user to conveniently manage data for a role associated with the text role. A common example of this is an enum stored in a backend with nicely formatted text displayed to the user. Before this patch, developers would have to write code like this: ComboBox { textRole: "text" onActivated: backend.modifier = model[currentIndex].value Component.onCompleted: currentIndex = findValue(backend.modifier) model: [ { value: Qt.NoModifier, text: qsTr("No modifier") }, { value: Qt.ShiftModifier, text: qsTr("Shift") }, { value: Qt.ControlModifier, text: qsTr("Control") } ] function findValue(value) { for (var i = 0; i < model.length; ++i) { if (model[i].value === value) return i } return -1 } } With this patch, the code becomes much simpler: ComboBox { textRole: "text" valueRole: "value" onActivated: backend.modifier = currentValue Component.onCompleted: currentIndex = indexOfValue(backend.modifier) model: [ { value: Qt.NoModifier, text: qsTr("No modifier") }, { value: Qt.ShiftModifier, text: qsTr("Shift") }, { value: Qt.ControlModifier, text: qsTr("Control") } ] } [ChangeLog][Controls][ComboBox] Added valueRole, currentValue and indexOfValue(). These allow convenient management of data for a role associated with the text role. Change-Id: I0ed19bd0ba9cf6b044a8113ff1a8782d43065449 Fixes: QTBUG-73491 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-03-04 10:12:05 +00:00
var control = createTemporaryObject(comboBox, testCase,
{ model: fruitmodel, textRole: "name", valueRole: "color" })
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
auto tests: prefer creating signal spies locally where needed It is tedious to always add new static SignalSpy instances for each tested signal. Just create signal spies locally in the same place where they are used. This makes it much more convenient to create more signal spies to achieve better coverage. This practice has been already used in newly written tests. Change-Id: I7f56c4b3cea0c55c34b85254f69a88ec73b8607f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-07 12:51:51 +00:00
var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(activatedSpy.valid)
auto tests: prefer creating signal spies locally where needed It is tedious to always add new static SignalSpy instances for each tested signal. Just create signal spies locally in the same place where they are used. This makes it much more convenient to create more signal spies to achieve better coverage. This practice has been already used in newly written tests. Change-Id: I7f56c4b3cea0c55c34b85254f69a88ec73b8607f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-07 12:51:51 +00:00
var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(highlightedSpy.valid)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"})
verify(closedSpy.valid)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
control.forceActiveFocus()
verify(control.activeFocus)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, -1)
keyClick(Qt.Key_Down)
compare(control.currentIndex, 1)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 1)
compare(activatedSpy.signalArguments[0][0], 1)
activatedSpy.clear()
keyClick(Qt.Key_Down)
compare(control.currentIndex, 2)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 1)
compare(activatedSpy.signalArguments[0][0], 2)
activatedSpy.clear()
keyClick(Qt.Key_Down)
compare(control.currentIndex, 2)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 0)
keyClick(Qt.Key_Up)
compare(control.currentIndex, 1)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 1)
compare(activatedSpy.signalArguments[0][0], 1)
activatedSpy.clear()
keyClick(Qt.Key_Up)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 1)
compare(activatedSpy.signalArguments[0][0], 0)
activatedSpy.clear()
keyClick(Qt.Key_Up)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, -1)
compare(highlightedSpy.count, 0)
compare(activatedSpy.count, 0)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// show popup
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
keyClick(Qt.Key_Space)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
openedSpy.wait()
compare(openedSpy.count, 1)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 0)
keyClick(Qt.Key_Down)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 1)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 1)
compare(highlightedSpy.signalArguments[0][0], 1)
highlightedSpy.clear()
keyClick(Qt.Key_Down)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 2)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 1)
compare(highlightedSpy.signalArguments[0][0], 2)
highlightedSpy.clear()
keyClick(Qt.Key_Down)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 2)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
keyClick(Qt.Key_Up)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 1)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 1)
compare(highlightedSpy.signalArguments[0][0], 1)
highlightedSpy.clear()
keyClick(Qt.Key_Up)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 0)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 1)
compare(highlightedSpy.signalArguments[0][0], 0)
highlightedSpy.clear()
keyClick(Qt.Key_Up)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 0)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
keyClick(Qt.Key_Down)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 1)
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 1)
compare(highlightedSpy.signalArguments[0][0], 1)
highlightedSpy.clear()
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// hide popup
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
keyClick(Qt.Key_Space)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
closedSpy.wait()
compare(closedSpy.count, 1)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
compare(control.currentIndex, 1)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
compare(control.highlightedIndex, -1)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
QQuickComboBox: handle Home and End keys [ChangeLog][Controls][ComboBox] Added handling for Home and End keys. Change-Id: I79ec0644f169503ab38a8e2bee18621a1f671478 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 08:40:47 +00:00
function test_keys_space_enter_escape_data() {
Qt Quick Controls: use QPlatformTheme::ButtonPressKeys for buttons ComboBox changes are included because it is button-like when not editable. MenuItem changes are included because it is an AbstractButton subclass. Change-Id: I30a540bc9e277cddc111cbc2400c4130dadedb3c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-02-16 21:57:50 +00:00
// Not testing Key_Enter + Key_Enter and Key_Return + Key_Return because
// QGnomeTheme uses Key_Enter and Key_Return for pressing buttons/comboboxes
// and the CI uses the QGnomeTheme platform theme.
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
return [
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
{ tag: "space-space", key1: Qt.Key_Space, key2: Qt.Key_Space, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
{ tag: "space-enter", key1: Qt.Key_Space, key2: Qt.Key_Enter, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
{ tag: "space-return", key1: Qt.Key_Space, key2: Qt.Key_Return, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
{ tag: "space-escape", key1: Qt.Key_Space, key2: Qt.Key_Escape, showPopup: true, showPress: true, hidePopup: true, hidePress: false },
{ tag: "space-0", key1: Qt.Key_Space, key2: Qt.Key_0, showPopup: true, showPress: true, hidePopup: false, hidePress: false },
{ tag: "escape-escape", key1: Qt.Key_Escape, key2: Qt.Key_Escape, showPopup: false, showPress: false, hidePopup: true, hidePress: false }
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
]
}
QQuickComboBox: handle Home and End keys [ChangeLog][Controls][ComboBox] Added handling for Home and End keys. Change-Id: I79ec0644f169503ab38a8e2bee18621a1f671478 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 08:40:47 +00:00
function test_keys_space_enter_escape(data) {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 3})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
tst_combobox: test both Window and ApplicationWindow Change-Id: Ic6dd06fc7826cb02ad8b258874dccb4937919c15 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-31 07:32:42 +00:00
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
control.forceActiveFocus()
verify(control.activeFocus)
compare(control.pressed, false)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// show popup
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
keyPress(data.key1)
compare(control.pressed, data.showPress)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
keyRelease(data.key1)
compare(control.pressed, false)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, data.showPopup)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
if (data.showPopup)
openedSpy.wait()
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// hide popup
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
keyPress(data.key2)
compare(control.pressed, data.hidePress)
keyRelease(data.key2)
compare(control.pressed, false)
Fix tst_combobox for popup transitions Change-Id: Ia2eb18492b0cac280eed78d345e35ea640f53db7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-19 22:00:50 +00:00
tryCompare(control.popup, "visible", !data.hidePopup)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
QQuickComboBox: handle Home and End keys [ChangeLog][Controls][ComboBox] Added handling for Home and End keys. Change-Id: I79ec0644f169503ab38a8e2bee18621a1f671478 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 08:40:47 +00:00
function test_keys_home_end() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 5})
QQuickComboBox: handle Home and End keys [ChangeLog][Controls][ComboBox] Added handling for Home and End keys. Change-Id: I79ec0644f169503ab38a8e2bee18621a1f671478 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 08:40:47 +00:00
verify(control)
control.forceActiveFocus()
verify(control.activeFocus)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, -1)
var activatedCount = 0
var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"})
verify(activatedSpy.valid)
var highlightedCount = 0
var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"})
verify(highlightedSpy.valid)
var currentIndexCount = 0
var currentIndexSpy = signalSpy.createObject(control, {target: control, signalName: "currentIndexChanged"})
verify(currentIndexSpy.valid)
var highlightedIndexCount = 0
var highlightedIndexSpy = signalSpy.createObject(control, {target: control, signalName: "highlightedIndexChanged"})
verify(highlightedIndexSpy.valid)
// end (popup closed)
keyClick(Qt.Key_End)
compare(control.currentIndex, 4)
compare(currentIndexSpy.count, ++currentIndexCount)
compare(control.highlightedIndex, -1)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, ++activatedCount)
compare(activatedSpy.signalArguments[activatedCount-1][0], 4)
compare(highlightedSpy.count, highlightedCount)
// repeat (no changes/signals)
keyClick(Qt.Key_End)
compare(currentIndexSpy.count, currentIndexCount)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, highlightedCount)
// home (popup closed)
keyClick(Qt.Key_Home)
compare(control.currentIndex, 0)
compare(currentIndexSpy.count, ++currentIndexCount)
compare(control.highlightedIndex, -1)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, ++activatedCount)
compare(activatedSpy.signalArguments[activatedCount-1][0], 0)
compare(highlightedSpy.count, highlightedCount)
// repeat (no changes/signals)
keyClick(Qt.Key_Home)
compare(currentIndexSpy.count, currentIndexCount)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, highlightedCount)
control.popup.open()
compare(control.highlightedIndex, 0)
compare(highlightedIndexSpy.count, ++highlightedIndexCount)
compare(highlightedSpy.count, highlightedCount)
// end (popup open)
keyClick(Qt.Key_End)
compare(control.currentIndex, 0)
compare(currentIndexSpy.count, currentIndexCount)
compare(control.highlightedIndex, 4)
compare(highlightedIndexSpy.count, ++highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, ++highlightedCount)
compare(highlightedSpy.signalArguments[highlightedCount-1][0], 4)
// repeat (no changes/signals)
keyClick(Qt.Key_End)
compare(currentIndexSpy.count, currentIndexCount)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, highlightedCount)
// home (popup open)
keyClick(Qt.Key_Home)
compare(control.currentIndex, 0)
compare(currentIndexSpy.count, currentIndexCount)
compare(control.highlightedIndex, 0)
compare(highlightedIndexSpy.count, ++highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, ++highlightedCount)
compare(highlightedSpy.signalArguments[highlightedCount-1][0], 0)
// repeat (no changes/signals)
keyClick(Qt.Key_Home)
compare(currentIndexSpy.count, currentIndexCount)
compare(highlightedIndexSpy.count, highlightedIndexCount)
compare(activatedSpy.count, activatedCount)
compare(highlightedSpy.count, highlightedCount)
}
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
function test_keySearch() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]})
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
verify(control)
control.forceActiveFocus()
verify(control.activeFocus)
compare(control.currentIndex, 0)
compare(control.currentText, "Banana")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
keyPress(Qt.Key_C)
compare(control.currentIndex, 1)
compare(control.currentText, "Coco")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
// no match
keyPress(Qt.Key_N)
compare(control.currentIndex, 1)
compare(control.currentText, "Coco")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
keyPress(Qt.Key_C)
compare(control.currentIndex, 2)
compare(control.currentText, "Coconut")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
keyPress(Qt.Key_C)
compare(control.currentIndex, 4)
compare(control.currentText, "Cocomuffin")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
// wrap
keyPress(Qt.Key_C)
compare(control.currentIndex, 1)
compare(control.currentText, "Coco")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
keyPress(Qt.Key_A)
compare(control.currentIndex, 3)
compare(control.currentText, "Apple")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
keyPress(Qt.Key_B)
compare(control.currentIndex, 0)
compare(control.currentText, "Banana")
ComboBox: fix key search in the popup ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-12 12:07:12 +00:00
compare(control.highlightedIndex, -1)
// popup
control.popup.open()
tryCompare(control.popup, "opened", true)
compare(control.currentIndex, 0)
compare(control.highlightedIndex, 0)
keyClick(Qt.Key_C)
compare(control.highlightedIndex, 1) // "Coco"
compare(control.currentIndex, 0)
// no match
keyClick(Qt.Key_N)
compare(control.highlightedIndex, 1)
compare(control.currentIndex, 0)
keyClick(Qt.Key_C)
compare(control.highlightedIndex, 2) // "Coconut"
compare(control.currentIndex, 0)
keyClick(Qt.Key_C)
compare(control.highlightedIndex, 4) // "Cocomuffin"
compare(control.currentIndex, 0)
// wrap
keyClick(Qt.Key_C)
compare(control.highlightedIndex, 1) // "Coco"
compare(control.currentIndex, 0)
keyClick(Qt.Key_B)
compare(control.highlightedIndex, 0) // "Banana"
compare(control.currentIndex, 0)
keyClick(Qt.Key_A)
compare(control.highlightedIndex, 3) // "Apple"
compare(control.currentIndex, 0)
verify(control.popup.visible)
// accept
keyClick(Qt.Key_Return)
tryCompare(control.popup, "visible", false)
compare(control.currentIndex, 3)
compare(control.currentText, "Apple")
compare(control.highlightedIndex, -1)
QQuickComboBox: key search [ChangeLog][Controls][ComboBox] Added missing keyboard search functionality. Change-Id: If132f2ca0bca8cdb09de03f584c07eec6fb384f6 Task-number: QTBUG-56884 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-03 09:07:50 +00:00
}
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
function test_popup() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 3})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
// show below
mousePress(control)
compare(control.pressed, true)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
mouseRelease(control)
compare(control.pressed, false)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, true)
verify(control.popup.contentItem.y >= control.y)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
// hide
mouseClick(control)
compare(control.pressed, false)
Fix tst_combobox for popup transitions Change-Id: Ia2eb18492b0cac280eed78d345e35ea640f53db7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-19 22:00:50 +00:00
tryCompare(control.popup, "visible", false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
// show above
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
control.y = control.Window.height - control.height
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
mousePress(control)
compare(control.pressed, true)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
mouseRelease(control)
compare(control.pressed, false)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, true)
verify(control.popup.contentItem.y < control.y)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Get the scale of the popup item when setting the parent item As there are some styles that will do an transition which animates the scale then we need to size and position based on the final scale it will have to avoid a jump after it has finished the transition. Pick-to: 5.15 Fixes: QTBUG-84488 Change-Id: I4571eb18c921e81de319838ac0e8d3fe3513d438 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-06 11:20:07 +00:00
// Account for when a transition of a scale from 0.9-1.0 that it is placed above right away and not below
// first just because there is room at the 0.9 scale
if (control.popup.enter !== null) {
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
// test only if there is a scale animation
let scaleAnimation = control.popup.enter.animations.some((animation) => {
return (animation instanceof PropertyAnimation && animation.property === "scale")
});
if (scaleAnimation) {
// hide
mouseClick(control)
compare(control.pressed, false)
tryCompare(control.popup, "visible", false)
control.y = control.Window.height - (control.popup.contentItem.height * 0.99)
var popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.popup, signalName: "yChanged"})
verify(popupYSpy.valid)
mousePress(control)
compare(control.pressed, true)
compare(control.popup.visible, false)
mouseRelease(control)
compare(control.pressed, false)
tryCompare(control.popup, "opened", true)
verify(control.popup.contentItem.y < control.y)
verify(popupYSpy.count === 1)
}
Get the scale of the popup item when setting the parent item As there are some styles that will do an transition which animates the scale then we need to size and position based on the final scale it will have to avoid a jump after it has finished the transition. Pick-to: 5.15 Fixes: QTBUG-84488 Change-Id: I4571eb18c921e81de319838ac0e8d3fe3513d438 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-06 11:20:07 +00:00
}
[autotest] Fix ComboBox::test_popup() for macOS style The popup's x position is not relative to the focus frame. The layoutMargins property describes the offset from the focus frame to the actual control. Task-number: QTBUG-95678 Change-Id: I65d945d12074be96d15d2e465223871f4f5463e9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2021-10-20 15:28:06 +00:00
var leftLayoutMargin = control.background.layoutMargins === undefined ? 0 : control.popup.layoutMargins.left
ComboBox: restore the old popup behavior Make the Popup follow ComboBox outside the horizontal screen bounds. Setting an explicit width instead of implicit width does exactly this. Change-Id: I46f4e5e40d5012929badf39d50d70b9a7811f455 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-09 14:09:07 +00:00
// follow the control outside the horizontal window bounds
Modify tst_combobox.qml::test_popup() to accommodate PopupWindow popups The test_popup() test in tst_combobox.qml checks the popupItem position to guarantee that the position of the popup has been set as expected. For PopupWindow popup types, we need to map this position to global co-ords. Task-number: QTBUG-126553 Pick-to: 6.8 Change-Id: Ibf414ec59ecce2a1e34e447eee4213a8b202e8f6 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-07-11 09:35:02 +00:00
const prevX = control.popup.contentItem.parent.mapToGlobal(0, 0).x
ComboBox: restore the old popup behavior Make the Popup follow ComboBox outside the horizontal screen bounds. Setting an explicit width instead of implicit width does exactly this. Change-Id: I46f4e5e40d5012929badf39d50d70b9a7811f455 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-09 14:09:07 +00:00
control.x = -control.width / 2
compare(control.x, -control.width / 2)
Modify tst_combobox.qml::test_popup() to accommodate PopupWindow popups The test_popup() test in tst_combobox.qml checks the popupItem position to guarantee that the position of the popup has been set as expected. For PopupWindow popup types, we need to map this position to global co-ords. Task-number: QTBUG-126553 Pick-to: 6.8 Change-Id: Ibf414ec59ecce2a1e34e447eee4213a8b202e8f6 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-07-11 09:35:02 +00:00
if(control.popup.popupType === Popup.Item) {
compare(control.popup.contentItem.parent.x, -control.width / 2 + leftLayoutMargin)
} else if (control.popup.popupType === Popup.Window) {
const x = control.popup.contentItem.parent.mapToGlobal(0, 0).x
compare(x - prevX, -control.width / 2 + leftLayoutMargin)
}
ComboBox: restore the old popup behavior Make the Popup follow ComboBox outside the horizontal screen bounds. Setting an explicit width instead of implicit width does exactly this. Change-Id: I46f4e5e40d5012929badf39d50d70b9a7811f455 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-09 14:09:07 +00:00
control.x = testCase.width - control.width / 2
compare(control.x, testCase.width - control.width / 2)
Modify tst_combobox.qml::test_popup() to accommodate PopupWindow popups The test_popup() test in tst_combobox.qml checks the popupItem position to guarantee that the position of the popup has been set as expected. For PopupWindow popup types, we need to map this position to global co-ords. Task-number: QTBUG-126553 Pick-to: 6.8 Change-Id: Ibf414ec59ecce2a1e34e447eee4213a8b202e8f6 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-07-11 09:35:02 +00:00
if (control.popup.popupType === Popup.Item) {
compare(control.popup.contentItem.parent.x, testCase.width - control.width / 2 + leftLayoutMargin)
} else if (control.popup.popupType === Popup.Window) {
const x = control.popup.contentItem.parent.mapToGlobal(0, 0).x
compare(x - prevX, testCase.width - control.width / 2 + leftLayoutMargin)
}
ComboBox: reset when hidden Close the popup and reset the pressed state. Same as in focusOutEvent(). Task-number: QTBUG-67684 Change-Id: I51143175b0f90f3edd116723481faed6ac6e7988 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-23 10:45:24 +00:00
// close the popup when hidden (QTBUG-67684)
control.popup.open()
tryCompare(control.popup, "opened", true)
control.visible = false
tryCompare(control.popup, "visible", false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
Reset the opacity and scale properties after the exit transition By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Pick-to: 5.15 Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-19 09:52:42 +00:00
Component {
id: reopenCombo
Window {
property alias innerCombo: innerCombo
visible: true
width: 300
height: 300
ComboBox {
id: innerCombo
model: 10
anchors.verticalCenter: parent.verticalCenter
}
}
}
// This test checks that when reopening the combobox that it is still appears at the same y position as
// previously
function test_reopen_popup() {
var control = createTemporaryObject(reopenCombo, testCase)
verify(control)
var y = 0;
for (var i = 0; i < 2; ++i) {
tryCompare(control.innerCombo.popup, "visible", false)
control.innerCombo.y = control.height - (control.innerCombo.popup.contentItem.height * 0.99)
var popupYSpy = createTemporaryObject(signalSpy, testCase, {target: control.innerCombo.popup, signalName: "yChanged"})
verify(popupYSpy.valid)
mousePress(control.innerCombo)
compare(control.innerCombo.pressed, true)
compare(control.innerCombo.popup.visible, false)
mouseRelease(control.innerCombo)
compare(control.innerCombo.pressed, false)
compare(control.innerCombo.popup.visible, true)
if (control.innerCombo.popup.enter)
tryCompare(control.innerCombo.popup.enter, "running", false)
// Check on the second opening that it has the same y position as before
if (i !== 0) {
// y should not have changed again
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
if (StyleInfo.styleName !== "FluentWinUI3") // the popup y in FluentWinUI3 depends on the implicitHeight
verify(popupYSpy.count === 0)
Reset the opacity and scale properties after the exit transition By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Pick-to: 5.15 Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-19 09:52:42 +00:00
verify(y === control.innerCombo.popup.y)
} else {
// In some cases on the initial show, y changes more than once
tst_combobox.qml::test_reopen_popup() fix for Popup.Window types When popupType is set to Popup.Window tst_combobox.qml::test_reopen_popup() fails. This is because QWindow geometry changes are not immediate and so a simple fix is to use a tryVerify() instead of a verify(). Task-number: QTBUG-126553 Pick-to: 6.8 Change-Id: Ib65074fa8b1f416848f6f0e60d00b4c1650868c2 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-07-10 12:19:58 +00:00
tryVerify(function(){ return popupYSpy.count >= 1 })
Reset the opacity and scale properties after the exit transition By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Pick-to: 5.15 Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-19 09:52:42 +00:00
y = control.innerCombo.popup.y
mouseClick(control.innerCombo)
compare(control.innerCombo.pressed, false)
tryCompare(control.innerCombo.popup, "visible", false)
}
}
}
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
function test_mouse() {
tst_combobox: attempt to stabilize test_mouse() Disable hover to avoid unexpected changes. Task-number: QTBUG-60480 Change-Id: I22fab5c95daa42f3c84437072bce49cac5c705af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-10-02 12:52:31 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 3, hoverEnabled: false})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
auto tests: prefer creating signal spies locally where needed It is tedious to always add new static SignalSpy instances for each tested signal. Just create signal spies locally in the same place where they are used. This makes it much more convenient to create more signal spies to achieve better coverage. This practice has been already used in newly written tests. Change-Id: I7f56c4b3cea0c55c34b85254f69a88ec73b8607f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-07 12:51:51 +00:00
var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(activatedSpy.valid)
mouseClick(control)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, true)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
var content = control.popup.contentItem
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
waitForRendering(content)
// press - move - release outside - not activated - not closed
mousePress(content)
compare(activatedSpy.count, 0)
mouseMove(content, content.width * 2)
compare(activatedSpy.count, 0)
mouseRelease(content, content.width * 2)
compare(activatedSpy.count, 0)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, true)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
// press - move - release inside - activated - closed
mousePress(content)
compare(activatedSpy.count, 0)
mouseMove(content, content.width / 2 + 1, content.height / 2 + 1)
compare(activatedSpy.count, 0)
mouseRelease(content)
compare(activatedSpy.count, 1)
Fix tst_combobox for popup transitions Change-Id: Ia2eb18492b0cac280eed78d345e35ea640f53db7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-19 22:00:50 +00:00
tryCompare(control.popup, "visible", false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
QQuickComboBox: handle touch events Task-number: QTBUG-58389 Change-Id: I7120d7bce827beb97a9ae3eaf4e99cf6b6e9f209 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-19 11:39:41 +00:00
function test_touch() {
var control = createTemporaryObject(comboBox, testCase, {model: 3})
verify(control)
var touch = touchEvent(control)
var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"})
verify(activatedSpy.valid)
var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"})
verify(highlightedSpy.valid)
touch.press(0, control).commit()
touch.release(0, control).commit()
compare(control.popup.visible, true)
var content = control.popup.contentItem
waitForRendering(content)
// press - move - release outside - not activated - not closed
touch.press(0, control).commit()
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
touch.move(0, control, control.width * 2, control.height / 2).commit()
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
touch.release(0, control, control.width * 2, control.height / 2).commit()
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
compare(control.popup.visible, true)
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
tryCompare(control.popup, "opened", true)
QQuickComboBox: handle touch events Task-number: QTBUG-58389 Change-Id: I7120d7bce827beb97a9ae3eaf4e99cf6b6e9f209 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-19 11:39:41 +00:00
// press - move - release inside - activated - closed
touch.press(0, content).commit()
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
touch.move(0, content, content.width / 2 + 1, content.height / 2 + 1).commit()
compare(activatedSpy.count, 0)
compare(highlightedSpy.count, 0)
touch.release(0, content).commit()
compare(activatedSpy.count, 1)
compare(highlightedSpy.count, 1)
tryCompare(control.popup, "visible", false)
}
Add QQuickComboBox::down This allows us to replace all "control.pressed || popup.visible" expressions with "control.down", and takes us one step closer to deferred popop execution as mentioned in the previous commit. In order to be able to defer the popup execution, we must get rid of such explicit references to the popup. Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-04 11:54:38 +00:00
function test_down() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 3})
Add QQuickComboBox::down This allows us to replace all "control.pressed || popup.visible" expressions with "control.down", and takes us one step closer to deferred popop execution as mentioned in the previous commit. In order to be able to defer the popup execution, we must get rid of such explicit references to the popup. Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-04 11:54:38 +00:00
verify(control)
// some styles position the popup over the combo button. move it out
// of the way to avoid stealing mouse presses. we want to test the
// combinations of the button being pressed and the popup being visible.
control.popup.y = control.height
var downSpy = signalSpy.createObject(control, {target: control, signalName: "downChanged"})
verify(downSpy.valid)
var pressedSpy = signalSpy.createObject(control, {target: control, signalName: "pressedChanged"})
verify(pressedSpy.valid)
mousePress(control)
compare(control.popup.visible, false)
compare(control.pressed, true)
compare(control.down, true)
compare(downSpy.count, 1)
compare(pressedSpy.count, 1)
mouseRelease(control)
compare(control.popup.visible, true)
compare(control.pressed, false)
compare(control.down, true)
compare(downSpy.count, 3)
compare(pressedSpy.count, 2)
Fix tst_combobox::test_down() when popupType is set to PopupWindow When popupType is set to PopupWindow, the geometry changes take longer to complete. For this reason a tryCompare should be used when checking for successful geometry changes. The current implementation of these tests don't test for different popupTypes, however, it is planned to do so in the future. This change is in preparation for that. Task-number: QTBUG-126553 Pick-to: 6.8 Change-Id: I1204e0b4b6bdd4a7f775dcd96c3ae6765786082b Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-07-05 09:38:33 +00:00
tryCompare(control.popup, "y", control.height)
tst_combobox: use larger window test_down() needs to place the popup below the combobox button to be able to test its pressed and down states while the popup is open. On some high DPI displays (Chromebook Pixel) the popup did not fit fully below, but got pushed partly over the button. Consequently, mouse presses went to the popup instead of the button and the test failed. Change-Id: I03e5768e00cf1eaf6d704a16ffe2b8d1705021b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-04 08:47:50 +00:00
Add QQuickComboBox::down This allows us to replace all "control.pressed || popup.visible" expressions with "control.down", and takes us one step closer to deferred popop execution as mentioned in the previous commit. In order to be able to defer the popup execution, we must get rid of such explicit references to the popup. Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-11-04 11:54:38 +00:00
control.down = false
compare(control.down, false)
compare(downSpy.count, 4)
mousePress(control)
compare(control.popup.visible, true)
compare(control.pressed, true)
compare(control.down, false) // explicit false
compare(downSpy.count, 4)
compare(pressedSpy.count, 3)
control.down = undefined
compare(control.down, true)
compare(downSpy.count, 5)
mouseRelease(control)
tryCompare(control.popup, "visible", false)
compare(control.pressed, false)
compare(control.down, false)
compare(downSpy.count, 6)
compare(pressedSpy.count, 4)
control.popup.open()
compare(control.popup.visible, true)
compare(control.pressed, false)
compare(control.down, true)
compare(downSpy.count, 7)
compare(pressedSpy.count, 4)
control.popup.close()
tryCompare(control.popup, "visible", false)
compare(control.pressed, false)
compare(control.down, false)
compare(downSpy.count, 8)
compare(pressedSpy.count, 4)
}
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
function test_focus() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 3})
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"})
verify(openedSpy.valid)
tst_combobox: test both Window and ApplicationWindow Change-Id: Ic6dd06fc7826cb02ad8b258874dccb4937919c15 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-31 07:32:42 +00:00
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// click - gain focus - show popup
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
mouseClick(control)
verify(control.activeFocus)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
openedSpy.wait()
compare(openedSpy.count, 1)
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
compare(control.popup.visible, true)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// lose focus - hide popup
tst_combobox: test both Window and ApplicationWindow Change-Id: Ic6dd06fc7826cb02ad8b258874dccb4937919c15 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-31 07:32:42 +00:00
control.focus = false
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(!control.activeFocus)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
closedSpy.wait()
compare(closedSpy.count, 1)
compare(control.popup.visible, false)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}
function test_baseline() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase)
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
verify(control)
compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset)
}
ComboBox: fix displayText initialization Make ComboBox::textAt(idx) call ObjectModel::object(idx) to force initialization of the model items. Change-Id: If99c9263fa00ae6d21a92f11a45caf6e1f6b731c Task-number: QTBUG-50143 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-23 13:32:12 +00:00
Component {
id: displayBox
ComboBox {
textRole: "key"
model: ListModel {
ListElement { key: "First"; value: 123 }
ListElement { key: "Second"; value: 456 }
ListElement { key: "Third"; value: 789 }
}
}
}
function test_displayText() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(displayBox, testCase)
ComboBox: fix displayText initialization Make ComboBox::textAt(idx) call ObjectModel::object(idx) to force initialization of the model items. Change-Id: If99c9263fa00ae6d21a92f11a45caf6e1f6b731c Task-number: QTBUG-50143 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-23 13:32:12 +00:00
verify(control)
compare(control.displayText, "First")
control.currentIndex = 1
compare(control.displayText, "Second")
control.textRole = "value"
compare(control.displayText, "456")
control.displayText = "Display"
compare(control.displayText, "Display")
control.currentIndex = 2
compare(control.displayText, "Display")
control.displayText = undefined
compare(control.displayText, "789")
}
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
Component {
id: component
Pane {
id: panel
property alias button: _button;
property alias combobox: _combobox;
font.pixelSize: 30
Column {
Button {
id: _button
text: "Button"
font.pixelSize: 20
}
ComboBox {
id: _combobox
model: ["ComboBox", "With"]
delegate: ItemDelegate {
width: _combobox.width
text: _combobox.textRole ? (Array.isArray(_combobox.model) ? modelData[_combobox.textRole] : model[_combobox.textRole]) : modelData
objectName: "delegate"
autoExclusive: true
checked: _combobox.currentIndex === index
highlighted: _combobox.highlightedIndex === index
}
}
}
}
}
function getChild(control, objname, idx) {
var index = idx
for (var i = index+1; i < control.children.length; i++)
{
if (control.children[i].objectName === objname) {
index = i
break
}
}
return index
}
Fix popup fonts This is a partial revert of a405919. This change makes popups inherit the window font instead of the parent item font. Change-Id: Ie360e3831aadbd167859e17d381edf3a28945300 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-03-10 16:29:29 +00:00
function test_font() { // QTBUG_50984, QTBUG-51696
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(component, testCase)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
verify(control)
verify(control.button)
verify(control.combobox)
Native style: remove setting font from QStyle This is a follow-up on 43eca45b06. Which font a control should use should follow normal font propagation. So setting a different font explicitly in every control is not ideal. The font is in practice the same for all controls anyway. This will also remove a warning that will be printed if the application assigns a custom background delegate to a Button. Fixes: QTBUG-98098 Change-Id: I4f9304b391b4b9e398882fc532cbff5b09f53aff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-12-20 10:54:29 +00:00
var expectedComboBoxFontPixelSize = 30
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
compare(control.font.pixelSize, 30)
compare(control.button.font.pixelSize, 20)
[autotest] Fix ComboBox::test_font() for macOS style macOS style does not support a different font than the default system font. Task-number: QTBUG-95678 Change-Id: Ib06118920e9cc6fcdc2af3ab34d76a4bc347a3d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2021-10-20 14:07:00 +00:00
compare(control.combobox.font.pixelSize, expectedComboBoxFontPixelSize)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// verify(control.combobox.popup)
// var popup = control.combobox.popup
// popup.open()
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// verify(popup.contentItem)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// var listview = popup.contentItem
// verify(listview.contentItem)
// waitForRendering(listview)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// var idx1 = getChild(listview.contentItem, "delegate", -1)
// compare(listview.contentItem.children[idx1].font.pixelSize, 25)
// var idx2 = getChild(listview.contentItem, "delegate", idx1)
// compare(listview.contentItem.children[idx2].font.pixelSize, 25)
Fix popup fonts This is a partial revert of a405919. This change makes popups inherit the window font instead of the parent item font. Change-Id: Ie360e3831aadbd167859e17d381edf3a28945300 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-03-10 16:29:29 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// compare(listview.contentItem.children[idx1].font.pixelSize, 25)
// compare(listview.contentItem.children[idx2].font.pixelSize, 25)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
control.font.pixelSize = control.font.pixelSize + 10
Native style: remove setting font from QStyle This is a follow-up on 43eca45b06. Which font a control should use should follow normal font propagation. So setting a different font explicitly in every control is not ideal. The font is in practice the same for all controls anyway. This will also remove a warning that will be printed if the application assigns a custom background delegate to a Button. Fixes: QTBUG-98098 Change-Id: I4f9304b391b4b9e398882fc532cbff5b09f53aff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-12-20 10:54:29 +00:00
expectedComboBoxFontPixelSize += 10
[autotest] Fix ComboBox::test_font() for macOS style macOS style does not support a different font than the default system font. Task-number: QTBUG-95678 Change-Id: Ib06118920e9cc6fcdc2af3ab34d76a4bc347a3d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2021-10-20 14:07:00 +00:00
compare(control.combobox.font.pixelSize, expectedComboBoxFontPixelSize)
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// waitForRendering(listview)
// compare(listview.contentItem.children[idx1].font.pixelSize, 25)
// compare(listview.contentItem.children[idx2].font.pixelSize, 25)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
control.combobox.font.pixelSize = control.combobox.font.pixelSize + 5
Native style: remove setting font from QStyle This is a follow-up on 43eca45b06. Which font a control should use should follow normal font propagation. So setting a different font explicitly in every control is not ideal. The font is in practice the same for all controls anyway. This will also remove a warning that will be printed if the application assigns a custom background delegate to a Button. Fixes: QTBUG-98098 Change-Id: I4f9304b391b4b9e398882fc532cbff5b09f53aff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-12-20 10:54:29 +00:00
compare(control.combobox.font.pixelSize, 45)
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// waitForRendering(listview)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
// idx1 = getChild(listview.contentItem, "delegate", -1)
// compare(listview.contentItem.children[idx1].font.pixelSize, 25)
// idx2 = getChild(listview.contentItem, "delegate", idx1)
// compare(listview.contentItem.children[idx2].font.pixelSize, 25)
Controls: fix font inheritance for popups QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-11 12:09:48 +00:00
}
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
tst_combobox: remove the extra ApplicationWindow instance These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-18 10:34:10 +00:00
function test_wheel() {
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
var ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100})
verify(ma)
var control = comboBox.createObject(ma, {model: 2, wheelEnabled: true})
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
verify(control)
var delta = 120
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
var spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"})
verify(spy.valid)
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta)
compare(control.currentIndex, 1)
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
compare(spy.count, 0) // no propagation
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
// reached bounds -> no change
mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta)
compare(control.currentIndex, 1)
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
compare(spy.count, 0) // no propagation
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
mouseWheel(control, control.width / 2, control.height / 2, delta, delta)
compare(control.currentIndex, 0)
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
compare(spy.count, 0) // no propagation
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
// reached bounds -> no change
mouseWheel(control, control.width / 2, control.height / 2, delta, delta)
compare(control.currentIndex, 0)
Combo|SpinBox: fix wheel event propagation Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-03-23 09:44:05 +00:00
compare(spy.count, 0) // no propagation
QQuickComboBox: handle wheel events to respect wheelEnabled Change-Id: I372c56d5a8fdda575d1e9a3d5fe4281c2c4f8c3c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-03 13:19:45 +00:00
}
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: tests/auto/controls/data/tst_combobox.qml Change-Id: I9d0c9a8adbe098720f0766e38db8aa2be4ed7408
2016-03-08 20:52:42 +00:00
ComboBox: fix activation The highlighted index is always -1 when the popup is hidden. Thus, when pressing enter/return, it should only activate the highlighted index when the popup is visible to avoid setting the current index to -1. Change-Id: I7a66e347bf2e4b62a67eb39b119ca1de299f16ef Task-number: QTBUG-51645 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-04 15:03:14 +00:00
function test_activation_data() {
return [
{ tag: "open:enter", key: Qt.Key_Enter, open: true },
{ tag: "open:return", key: Qt.Key_Return, open: true },
{ tag: "closed:enter", key: Qt.Key_Enter, open: false },
{ tag: "closed:return", key: Qt.Key_Return, open: false }
]
}
// QTBUG-51645
function test_activation(data) {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {currentIndex: 1, model: ["Apple", "Orange", "Banana"]})
ComboBox: fix activation The highlighted index is always -1 when the popup is hidden. Thus, when pressing enter/return, it should only activate the highlighted index when the popup is visible to avoid setting the current index to -1. Change-Id: I7a66e347bf2e4b62a67eb39b119ca1de299f16ef Task-number: QTBUG-51645 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-04 15:03:14 +00:00
verify(control)
control.forceActiveFocus()
verify(control.activeFocus)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
if (data.open) {
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
ComboBox: fix activation The highlighted index is always -1 when the popup is hidden. Thus, when pressing enter/return, it should only activate the highlighted index when the popup is visible to avoid setting the current index to -1. Change-Id: I7a66e347bf2e4b62a67eb39b119ca1de299f16ef Task-number: QTBUG-51645 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-04 15:03:14 +00:00
keyClick(Qt.Key_Space)
tst_combobox: get rid of waitForRendering() Change-Id: I91b0a529b293aaef8d17cfbc2aafa5ea1805a3f8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-04-25 13:22:19 +00:00
openedSpy.wait()
compare(openedSpy.count, 1)
}
ComboBox: fix activation The highlighted index is always -1 when the popup is hidden. Thus, when pressing enter/return, it should only activate the highlighted index when the popup is visible to avoid setting the current index to -1. Change-Id: I7a66e347bf2e4b62a67eb39b119ca1de299f16ef Task-number: QTBUG-51645 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-04 15:03:14 +00:00
compare(control.popup.visible, data.open)
compare(control.currentIndex, 1)
compare(control.currentText, "Orange")
compare(control.displayText, "Orange")
keyClick(data.key)
compare(control.currentIndex, 1)
compare(control.currentText, "Orange")
compare(control.displayText, "Orange")
}
ComboBox: fix usage in an asynchronous Loader The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-23 09:44:08 +00:00
Component {
id: asyncLoader
Loader {
active: false
asynchronous: true
sourceComponent: ComboBox {
model: ["First", "Second", "Third"]
}
}
}
// QTBUG-51972
function test_async() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var loader = createTemporaryObject(asyncLoader, testCase)
ComboBox: fix usage in an asynchronous Loader The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-23 09:44:08 +00:00
verify(loader)
loader.active = true
tryCompare(loader, "status", Loader.Ready)
verify(loader.item)
compare(loader.item.currentText, "First")
compare(loader.item.displayText, "First")
}
ComboBox: respect currentIndex:-1 Don't override explicitly set current index in Component.onCompleted. Task-number: QTBUG-52615 Change-Id: If5ce4ec1db29f8ac94d457d297910d61fb0b8a18 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-17 17:28:17 +00:00
// QTBUG-52615
function test_currentIndex() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {currentIndex: -1, model: 3})
ComboBox: respect currentIndex:-1 Don't override explicitly set current index in Component.onCompleted. Task-number: QTBUG-52615 Change-Id: If5ce4ec1db29f8ac94d457d297910d61fb0b8a18 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-17 17:28:17 +00:00
verify(control)
compare(control.currentIndex, -1)
}
Fix QQuickComboBox::textAt() QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-05 14:57:12 +00:00
ListModel {
id: resetmodel
ListElement { text: "First" }
ListElement { text: "Second" }
ListElement { text: "Third" }
}
// QTBUG-54573
function test_modelReset() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: resetmodel})
Fix QQuickComboBox::textAt() QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-05 14:57:12 +00:00
verify(control)
control.popup.open()
var listview = control.popup.contentItem
verify(listview)
Stabilize tst_combobox::test_modelReset() Task-number: QTBUG-57256 Change-Id: I4317242f48f7c94a35d3f0c9a6793ef113b69e77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-12-13 12:56:45 +00:00
tryCompare(listview.contentItem.children, "length", resetmodel.count + 1) // + highlight item
Fix QQuickComboBox::textAt() QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-05 14:57:12 +00:00
resetmodel.clear()
resetmodel.append({text: "Fourth"})
resetmodel.append({text: "Fifth"})
Stabilize tst_combobox::test_modelReset() Task-number: QTBUG-57256 Change-Id: I4317242f48f7c94a35d3f0c9a6793ef113b69e77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-12-13 12:56:45 +00:00
tryCompare(listview.contentItem.children, "length", resetmodel.count + 1) // + highlight item
Fix QQuickComboBox::textAt() QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-05 14:57:12 +00:00
}
ComboBox: ensure an update of the current text on data change Task-number: QTBUG-55118 Change-Id: I4edcd660a35d8b8719fc4c09719332d088859ffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-08 22:13:30 +00:00
// QTBUG-55118
function test_currentText() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: listmodel})
ComboBox: ensure an update of the current text on data change Task-number: QTBUG-55118 Change-Id: I4edcd660a35d8b8719fc4c09719332d088859ffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-08 22:13:30 +00:00
verify(control)
compare(control.currentIndex, 0)
compare(control.currentText, "First")
listmodel.setProperty(0, "text", "1st")
compare(control.currentText, "1st")
control.currentIndex = 1
compare(control.currentText, "Second")
listmodel.setProperty(0, "text", "First")
compare(control.currentText, "Second")
}
Fix ComboBox to scroll to the highlighted item Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-10-01 21:02:43 +00:00
// QTBUG-55030
function test_highlightRange() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 100})
Fix ComboBox to scroll to the highlighted item Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-10-01 21:02:43 +00:00
verify(control)
control.currentIndex = 50
compare(control.currentIndex, 50)
compare(control.highlightedIndex, -1)
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
control.popup.open()
compare(control.highlightedIndex, 50)
tryCompare(openedSpy, "count", 1)
var listview = control.popup.contentItem
verify(listview)
var first = listview.itemAt(0, listview.contentY)
verify(first)
compare(first.text, "50")
var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"})
verify(closedSpy.valid)
control.popup.close()
tryCompare(closedSpy, "count", 1)
compare(control.highlightedIndex, -1)
control.currentIndex = 99
compare(control.currentIndex, 99)
compare(control.highlightedIndex, -1)
control.popup.open()
compare(control.highlightedIndex, 99)
tryCompare(openedSpy, "count", 2)
tst_combobox: make test_highlightRange() more reliable This test is failing with the upcoming Fusion style, perhaps because the combo delegates are a bit heavier. Give the Popup and ListView some time to layout themselves, before attempting to find a list item at the bottom. Change-Id: Ib8486bb7dbc4a43eb3549e2e7ca7ad1be5bad4a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-22 10:34:03 +00:00
tryVerify(function() { return listview.height > 0 })
Fix ComboBox to scroll to the highlighted item Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-10-01 21:02:43 +00:00
var last = listview.itemAt(0, listview.contentY + listview.height - 1)
verify(last)
compare(last.text, "99")
openedSpy.target = null
closedSpy.target = null
}
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
QQuickComboBox: update highlighted index on mouse hover This is the expected behavior on desktop. NOTE: We can no longer rely on ListView.ApplyRange, because if ListView adjusts the content position while key navigating or scrolling, "wrong" items may get hovered and the highlighted index gets set incorrectly leading to a hovered->highlight->hovered loop. Therefore we force ListView.NoHighlightRange to keep existing styles working without modifications. Change-Id: I57fe3de1230dd6348d01c1785cd09d4fb184d28a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-16 13:51:40 +00:00
function test_mouseHighlight() {
Fix tests for boot2qt The tests for boot2qt were disabled with commit 28063805bf22b77a93f22a4289ca8afa9f1cb201. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Some tests involving mouse behavior and window grabbing need to be skipped on minimal/offscreen platforms. Task-number: QTBUG-60268 Change-Id: Ib468638df8d5001bf127dd17aee7dcfe38b11780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 09:48:40 +00:00
if ((Qt.platform.pluginName === "offscreen")
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro src/imports/controls/ComboBox.qml src/quicktemplates2/qquickabstractbutton.cpp src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickapplicationwindow_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p.h src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquicklabel_p.h src/quicktemplates2/qquicklabel_p_p.h src/quicktemplates2/qquickslider_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p.h src/quicktemplates2/qquicktextfield_p_p.h tests/auto/auto.pro tests/auto/controls/data/tst_combobox.qml Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
2017-12-15 10:44:26 +00:00
|| (Qt.platform.pluginName === "minimal"))
Fix tests for boot2qt The tests for boot2qt were disabled with commit 28063805bf22b77a93f22a4289ca8afa9f1cb201. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Some tests involving mouse behavior and window grabbing need to be skipped on minimal/offscreen platforms. Task-number: QTBUG-60268 Change-Id: Ib468638df8d5001bf127dd17aee7dcfe38b11780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 09:48:40 +00:00
skip("Mouse highlight not functional on offscreen/minimal platforms")
QQuickComboBox: update highlighted index on mouse hover This is the expected behavior on desktop. NOTE: We can no longer rely on ListView.ApplyRange, because if ListView adjusts the content position while key navigating or scrolling, "wrong" items may get hovered and the highlighted index gets set incorrectly leading to a hovered->highlight->hovered loop. Therefore we force ListView.NoHighlightRange to keep existing styles working without modifications. Change-Id: I57fe3de1230dd6348d01c1785cd09d4fb184d28a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-16 13:51:40 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: 20})
verify(control)
compare(control.highlightedIndex, -1)
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
control.popup.open()
compare(control.highlightedIndex, 0)
tryCompare(openedSpy, "count", 1)
var listview = control.popup.contentItem
verify(listview)
waitForRendering(listview)
// hover-highlight through all visible list items one by one
var hoverIndex = -1
var prevHoverItem = null
for (var y = 0; y < listview.height; ++y) {
var hoverItem = listview.itemAt(0, listview.contentY + y)
if (!hoverItem || !hoverItem.visible || hoverItem === prevHoverItem)
continue
mouseMove(hoverItem, 0, 0)
tryCompare(control, "highlightedIndex", ++hoverIndex)
prevHoverItem = hoverItem
}
mouseMove(listview, listview.width / 2, listview.height / 2)
// wheel-highlight the rest of the items
var delta = 120
var prevWheelItem = null
while (!listview.atYEnd) {
var prevContentY = listview.contentY
mouseWheel(listview, listview.width / 2, listview.height / 2, -delta, -delta)
tryCompare(listview, "moving", false)
verify(listview.contentY > prevContentY)
var wheelItem = listview.itemAt(listview.width / 2, listview.contentY + listview.height / 2)
if (!wheelItem || !wheelItem.visible || wheelItem === prevWheelItem)
continue
tryCompare(control, "highlightedIndex", parseInt(wheelItem.text))
prevWheelItem = wheelItem
}
}
Remove the remaining usages of QRegExp and QRegExpValidator Change-Id: Iab8e682eeb43b3403eba37f7decb7f7a494ae361 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 15:49:13 +00:00
RegularExpressionValidator {
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
id: regExpValidator
Remove the remaining usages of QRegExp and QRegExpValidator Change-Id: Iab8e682eeb43b3403eba37f7decb7f7a494ae361 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 15:49:13 +00:00
regularExpression: /(red|blue|green)?/
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
}
function test_validator() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {editable: true, validator: regExpValidator})
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
control.editText = "blu"
compare(control.acceptableInput, false)
control.editText = "blue"
compare(control.acceptableInput, true)
control.editText = "bluee"
compare(control.acceptableInput, false)
control.editText = ""
compare(control.acceptableInput, true)
control.editText = ""
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
control.contentItem.forceActiveFocus()
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
keyPress(Qt.Key_A)
compare(control.editText, "")
keyPress(Qt.Key_A)
compare(control.editText, "")
keyPress(Qt.Key_R)
compare(control.editText, "r")
keyPress(Qt.Key_A)
compare(control.editText, "r")
compare(control.acceptableInput, false)
keyPress(Qt.Key_E)
compare(control.editText, "re")
compare(control.acceptableInput, false)
keyPress(Qt.Key_D)
compare(control.editText, "red")
compare(control.acceptableInput, true)
}
Component {
id: appendFindBox
ComboBox {
editable: true
model: ListModel {
ListElement { text:"first" }
}
onAccepted: {
if (find(editText) === -1)
model.append({text: editText})
}
}
}
function test_append_find() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(appendFindBox, testCase)
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
compare(control.currentIndex, 0)
compare(control.currentText, "first")
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
control.contentItem.forceActiveFocus()
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
compare(control.activeFocus, true)
control.selectAll()
keyPress(Qt.Key_T)
keyPress(Qt.Key_H)
keyPress(Qt.Key_I)
keyPress(Qt.Key_R)
keyPress(Qt.Key_D)
compare(control.count, 1)
compare(control.currentText, "first")
compare(control.editText, "third")
keyPress(Qt.Key_Enter)
compare(control.count, 2)
compare(control.currentIndex, 1)
compare(control.currentText, "third")
}
function test_editable() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {editable: true, model: ["Banana", "Coco", "Coconut", "Apple", "Cocomuffin"]})
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control)
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
control.contentItem.forceActiveFocus()
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control.activeFocus)
var acceptCount = 0
var acceptSpy = signalSpy.createObject(control, {target: control, signalName: "accepted"})
verify(acceptSpy.valid)
compare(control.editText, "Banana")
compare(control.currentText, "Banana")
compare(control.currentIndex, 0)
compare(acceptSpy.count, 0)
control.editText = ""
keyPress(Qt.Key_C)
compare(control.editText, "coco")
compare(control.currentText, "Banana")
compare(control.currentIndex, 0)
keyPress(Qt.Key_Right)
keyPress(Qt.Key_N)
compare(control.editText, "coconut")
compare(control.currentText, "Banana")
compare(control.currentIndex, 0)
keyPress(Qt.Key_Enter) // Accept
compare(control.editText, "Coconut")
compare(control.currentText, "Coconut")
compare(control.currentIndex, 2)
compare(acceptSpy.count, ++acceptCount)
keyPress(Qt.Key_Backspace)
keyPress(Qt.Key_Backspace)
keyPress(Qt.Key_Backspace)
keyPress(Qt.Key_M)
compare(control.editText, "Cocomuffin")
compare(control.currentText, "Coconut")
compare(control.currentIndex, 2)
keyPress(Qt.Key_Enter) // Accept
compare(control.editText, "Cocomuffin")
compare(control.currentText, "Cocomuffin")
compare(control.currentIndex, 4)
compare(acceptSpy.count, ++acceptCount)
keyPress(Qt.Key_Return) // Accept
compare(control.editText, "Cocomuffin")
compare(control.currentText, "Cocomuffin")
compare(control.currentIndex, 4)
compare(acceptSpy.count, ++acceptCount)
control.editText = ""
compare(control.editText, "")
compare(control.currentText, "Cocomuffin")
compare(control.currentIndex, 4)
keyPress(Qt.Key_A)
compare(control.editText, "apple")
compare(control.currentText, "Cocomuffin")
compare(control.currentIndex, 4)
keyPress(Qt.Key_Return) // Accept
compare(control.editText, "Apple")
compare(control.currentText, "Apple")
compare(control.currentIndex, 3)
compare(acceptSpy.count, ++acceptCount)
control.editText = ""
keyPress(Qt.Key_A)
keyPress(Qt.Key_B)
compare(control.editText, "ab")
compare(control.currentText, "Apple")
compare(control.currentIndex, 3)
keyPress(Qt.Key_Return) // Accept
compare(control.editText, "ab")
compare(control.currentText, "")
compare(control.currentIndex, -1)
compare(acceptSpy.count, ++acceptCount)
control.editText = ""
compare(control.editText, "")
compare(control.currentText, "")
compare(control.currentIndex, -1)
keyPress(Qt.Key_C)
keyPress(Qt.Key_Return) // Accept
compare(control.editText, "Coco")
compare(control.currentText, "Coco")
compare(control.currentIndex, 1)
compare(acceptSpy.count, ++acceptCount)
keyPress(Qt.Key_Down)
compare(control.editText, "Coconut")
compare(control.currentText, "Coconut")
compare(control.currentIndex, 2)
keyPress(Qt.Key_Up)
compare(control.editText, "Coco")
compare(control.currentText, "Coco")
compare(control.currentIndex, 1)
control.editText = ""
compare(control.editText, "")
compare(control.currentText, "Coco")
compare(control.currentIndex, 1)
keyPress(Qt.Key_C)
keyPress(Qt.Key_O)
keyPress(Qt.Key_C) // autocompletes "coco"
keyPress(Qt.Key_Backspace)
keyPress(Qt.Key_Return) // Accept "coc"
compare(control.editText, "coc")
compare(control.currentText, "")
compare(control.currentIndex, -1)
compare(acceptSpy.count, ++acceptCount)
control.editText = ""
compare(control.editText, "")
compare(control.currentText, "")
compare(control.currentIndex, -1)
keyPress(Qt.Key_C)
keyPress(Qt.Key_O)
keyPress(Qt.Key_C) // autocompletes "coc"
keyPress(Qt.Key_Space)
keyPress(Qt.Key_Return) // Accept "coc "
compare(control.editText, "coc ")
compare(control.currentText, "")
compare(control.currentIndex, -1)
compare(acceptSpy.count, ++acceptCount)
}
Component {
id: keysAttachedBox
ComboBox {
editable: true
property bool gotit: false
tst_controls: fix QML deprecation warnings Fix QML deprecation warning: "Parameter "event" is not declared. Injection of parameters into signal handlers is deprecated. Use JavaScript functions with formal parameters instead." Pick-to: 6.5 6.6 Change-Id: If4dde6cc4df124f663ab61be1352d62a1b4347f0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2023-06-19 20:29:50 +00:00
Keys.onPressed: function (event) {
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
if (!gotit && event.key === Qt.Key_B) {
gotit = true
event.accepted = true
}
}
}
}
function test_keys_attached() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(keysAttachedBox, testCase)
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control)
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
control.contentItem.forceActiveFocus()
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control.activeFocus)
verify(!control.gotit)
compare(control.editText, "")
keyPress(Qt.Key_A)
verify(control.activeFocus)
verify(!control.gotit)
compare(control.editText, "a")
keyPress(Qt.Key_B)
verify(control.activeFocus)
verify(control.gotit)
compare(control.editText, "a")
keyPress(Qt.Key_B)
verify(control.activeFocus)
verify(control.gotit)
compare(control.editText, "ab")
}
function test_minusOneIndexResetsSelection_QTBUG_35794_data() {
return [
{ tag: "editable", editable: true },
{ tag: "non-editable", editable: false }
]
}
function test_minusOneIndexResetsSelection_QTBUG_35794(data) {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {editable: data.editable, model: ["A", "B", "C"]})
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control)
compare(control.currentIndex, 0)
compare(control.currentText, "A")
control.currentIndex = -1
compare(control.currentIndex, -1)
compare(control.currentText, "")
control.currentIndex = 1
compare(control.currentIndex, 1)
compare(control.currentText, "B")
}
function test_minusOneToZeroSelection_QTBUG_38036() {
tst_combobox: use TestCase's new createTemporaryObject functions This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: Ib807ed5197df390521084c384d4e6ed6eb44fffa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-12-21 10:22:25 +00:00
var control = createTemporaryObject(comboBox, testCase, {model: ["A", "B", "C"]})
Add ComboBox::editable [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-10-01 19:08:09 +00:00
verify(control)
compare(control.currentIndex, 0)
compare(control.currentText, "A")
control.currentIndex = -1
compare(control.currentIndex, -1)
compare(control.currentText, "")
control.currentIndex = 0
compare(control.currentIndex, 0)
compare(control.currentText, "A")
}
ComboBox: fix empty popup being shown after model is cleared Currently, ComboBox's popup is sized vertically in this way: implicitHeight: contentItem.implicitHeight Adding an item to a ComboBox with an empty model and then opening the popup results in the implicitHeight being used in the line below (in QQuickPopupPositioner::reposition()): QRectF rect(p->allowHorizontalMove ? p->x : popupItem->x(), p->allowVerticalMove ? p->y : popupItem->y(), !p->hasWidth && iw > 0 ? iw : w, !p->hasHeight && ih > 0 ? ih : h); An explicit height was never set on the popup, and ih (the implicitHeight of the popupItem) is greater than 0. This is fine. However, when a ComboBox's popup item grows large enough that it has to be resized to fit within the window, its explicit height is set. The problem occurs when the model is then cleared, as the implicit height of the popup item becomes 0. So, while "!p->hasHeight" is still true, "ih > 0" is not, and the explicit height of the popup item is used, which is still the previous "let's fill the entire height of the window" size. To fix this, we bind the height of the popup to a different expression: height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) This ensures that the popup has a zero height when the ListView's implicitHeight is zero (i.e the model is empty), and a height that fits within the window in all other cases. Ideally, we'd have a maximumHeight property that controls this, but for 5.9, we have to fix it this way. Task-number: QTBUG-60684 Change-Id: Ied94c79bb7b0e693be34e9c7282d991f6f704770 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-05-31 15:14:49 +00:00
function test_emptyPopupAfterModelCleared() {
var control = createTemporaryObject(comboBox, testCase, { model: 1 })
verify(control)
compare(control.popup.implicitHeight, 0)
// Ensure that it's open so that the popup's implicitHeight changes when we increase the model count.
control.popup.open()
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
tryCompare(control.popup, "opened", true)
ComboBox: fix empty popup being shown after model is cleared Currently, ComboBox's popup is sized vertically in this way: implicitHeight: contentItem.implicitHeight Adding an item to a ComboBox with an empty model and then opening the popup results in the implicitHeight being used in the line below (in QQuickPopupPositioner::reposition()): QRectF rect(p->allowHorizontalMove ? p->x : popupItem->x(), p->allowVerticalMove ? p->y : popupItem->y(), !p->hasWidth && iw > 0 ? iw : w, !p->hasHeight && ih > 0 ? ih : h); An explicit height was never set on the popup, and ih (the implicitHeight of the popupItem) is greater than 0. This is fine. However, when a ComboBox's popup item grows large enough that it has to be resized to fit within the window, its explicit height is set. The problem occurs when the model is then cleared, as the implicit height of the popup item becomes 0. So, while "!p->hasHeight" is still true, "ih > 0" is not, and the explicit height of the popup item is used, which is still the previous "let's fill the entire height of the window" size. To fix this, we bind the height of the popup to a different expression: height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) This ensures that the popup has a zero height when the ListView's implicitHeight is zero (i.e the model is empty), and a height that fits within the window in all other cases. Ideally, we'd have a maximumHeight property that controls this, but for 5.9, we have to fix it this way. Task-number: QTBUG-60684 Change-Id: Ied94c79bb7b0e693be34e9c7282d991f6f704770 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-05-31 15:14:49 +00:00
// Add lots of items to the model. The popup should take up the entire height of the window.
control.model = 100
compare(control.popup.height, control.Window.height - control.popup.topMargin - control.popup.bottomMargin)
control.popup.close()
// Clearing the model should result in a zero height.
control.model = 0
control.popup.open()
tryCompare(control.popup, "visible", true)
tst_combobox: Fix some failing tests for FluentWinUI3 style - When checking scale animation transition, first make sure that the transition includes an animation with the scale property. The FluentWinUI3 style animates on a different property and the test fails. - Skip the test for the FluentWinUI3 style when checking that the y coordinate is never changed between opening and reopening the popup. This depends on the implicit height of the popup for the FluentWinUI3 style, and that changes between opening/reopening. - Make sure that popup enter transitions are finished before testing events Pick-to: 6.8 Change-Id: Ic3ca570db5e4ce399f52d7d2f266a4ba48a255a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2024-06-04 13:57:41 +00:00
if (control.popup.enter !== null)
tryCompare(control.popup.enter, "running", false)
Merge remote-tracking branch 'origin/5.9' into dev Fusion style ComboBox popup height was adjusted according to 90a0d402 to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass with the Fusion style. Conflicts: src/imports/controls/ComboBox.qml src/imports/controls/material/ComboBox.qml src/imports/controls/universal/ComboBox.qml Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
2017-06-06 18:40:54 +00:00
compare(control.popup.height, control.popup.topPadding + control.popup.bottomPadding)
ComboBox: fix empty popup being shown after model is cleared Currently, ComboBox's popup is sized vertically in this way: implicitHeight: contentItem.implicitHeight Adding an item to a ComboBox with an empty model and then opening the popup results in the implicitHeight being used in the line below (in QQuickPopupPositioner::reposition()): QRectF rect(p->allowHorizontalMove ? p->x : popupItem->x(), p->allowVerticalMove ? p->y : popupItem->y(), !p->hasWidth && iw > 0 ? iw : w, !p->hasHeight && ih > 0 ? ih : h); An explicit height was never set on the popup, and ih (the implicitHeight of the popupItem) is greater than 0. This is fine. However, when a ComboBox's popup item grows large enough that it has to be resized to fit within the window, its explicit height is set. The problem occurs when the model is then cleared, as the implicit height of the popup item becomes 0. So, while "!p->hasHeight" is still true, "ih > 0" is not, and the explicit height of the popup item is used, which is still the previous "let's fill the entire height of the window" size. To fix this, we bind the height of the popup to a different expression: height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) This ensures that the popup has a zero height when the ListView's implicitHeight is zero (i.e the model is empty), and a height that fits within the window in all other cases. Ideally, we'd have a maximumHeight property that controls this, but for 5.9, we have to fix it this way. Task-number: QTBUG-60684 Change-Id: Ied94c79bb7b0e693be34e9c7282d991f6f704770 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-05-31 15:14:49 +00:00
}
ComboBox: don't block the escape/back key (with fixed test) Accept Key_Escape or Key_Back only if it actually close the popup. If the popup is not visible, the key is not handled, and the event should therefore propagate (and potentially close the app on Android). Note: def92f7 had a broken test (didn't take the popup exit transition into account) and thus, blocked the CI and got rejected in 110b718. Task-number: QTBUG-67684 Change-Id: I46b4731b3006721f3737cf909fbd97331ac6d8ed Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-23 12:05:25 +00:00
Component {
id: keysMonitor
Item {
property int pressedKeys: 0
property int releasedKeys: 0
property int lastPressedKey: 0
property int lastReleasedKey: 0
property alias comboBox: comboBox
width: 200
height: 200
Use regular key events for cancelling popups We should avoid creating shortcuts for special keys like Cancel (Back/Escape), as it can interfere with the user's own shortcuts by e.g. requiring use of Keys.shortcutOverride, which itself can only be sent to items with active focus, preventing users from overriding Qt's global shortcuts in some cases. [ChangeLog][Controls][Important Behavior Changes] Popups no longer handle the Escape and Back keys by grabbing them as shortcuts, instead they are treated as regular events. This also means that popups that should be closable with the Escape or Back keys must have focus. Task-number: QTBUG-79280 Change-Id: Iaf7249226d5766b2ab101630de5590b9524c56dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-02-25 07:38:53 +00:00
Keys.onPressed: (event) => { ++pressedKeys; lastPressedKey = event.key }
Keys.onReleased: (event) => { ++releasedKeys; lastReleasedKey = event.key }
ComboBox: don't block the escape/back key (with fixed test) Accept Key_Escape or Key_Back only if it actually close the popup. If the popup is not visible, the key is not handled, and the event should therefore propagate (and potentially close the app on Android). Note: def92f7 had a broken test (didn't take the popup exit transition into account) and thus, blocked the CI and got rejected in 110b718. Task-number: QTBUG-67684 Change-Id: I46b4731b3006721f3737cf909fbd97331ac6d8ed Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-23 12:05:25 +00:00
ComboBox {
id: comboBox
}
}
}
function test_keyClose_data() {
return [
{ tag: "Escape", key: Qt.Key_Escape },
{ tag: "Back", key: Qt.Key_Back }
]
}
function test_keyClose(data) {
var container = createTemporaryObject(keysMonitor, testCase)
verify(container)
var control = comboBox.createObject(container)
verify(control)
control.forceActiveFocus()
verify(control.activeFocus)
var pressedKeys = 0
var releasedKeys = 0
// popup not visible -> propagates
keyPress(data.key)
compare(container.pressedKeys, ++pressedKeys)
compare(container.lastPressedKey, data.key)
keyRelease(data.key)
compare(container.releasedKeys, ++releasedKeys)
compare(container.lastReleasedKey, data.key)
verify(control.activeFocus)
// popup visible -> handled -> does not propagate
control.popup.open()
tryCompare(control.popup, "opened", true)
keyPress(data.key)
compare(container.pressedKeys, pressedKeys)
keyRelease(data.key)
compare(container.releasedKeys, releasedKeys)
tryCompare(control.popup, "visible", false)
verify(control.activeFocus)
// popup not visible -> propagates
keyPress(data.key)
compare(container.pressedKeys, ++pressedKeys)
compare(container.lastPressedKey, data.key)
keyRelease(data.key)
compare(container.releasedKeys, ++releasedKeys)
compare(container.lastReleasedKey, data.key)
}
QQuickComboBox: don't hide popup if focused The ComboBox popup should be closed when the ComboBox loses focus, but not if the control gaining focus is the popup itself. While all the styles implemented in this module implement the ComboBox popup as an unfocusable window and handle all the keyboard events in QQuickComboBox itself, the developer can choose to replace the popup with a custom implementation, which might need the keyboard focus. Fixes: QTBUG-74661 Change-Id: I838ab9cb697df63ea2099e68f1ae99eadb06be08 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-03-24 19:54:31 +00:00
function test_popupFocus_QTBUG_74661() {
var control = createTemporaryObject(comboBox, testCase)
verify(control)
var popup = createTemporaryObject(customPopup, testCase)
verify(popup)
control.popup = popup
var openedSpy = signalSpy.createObject(control, {target: popup, signalName: "opened"})
verify(openedSpy.valid)
var closedSpy = signalSpy.createObject(control, {target: popup, signalName: "closed"})
verify(closedSpy.valid)
control.forceActiveFocus()
verify(control.activeFocus)
// show popup
keyClick(Qt.Key_Space)
openedSpy.wait()
compare(openedSpy.count, 1)
popup.contentItem.forceActiveFocus()
verify(popup.contentItem.activeFocus)
// type something in the text field
keyClick(Qt.Key_Space)
keyClick(Qt.Key_H)
keyClick(Qt.Key_I)
compare(popup.contentItem.text, " hi")
compare(closedSpy.count, 0)
// hide popup
keyClick(Qt.Key_Escape)
closedSpy.wait()
compare(closedSpy.count, 1)
}
Add a test for having a ShaderEffect as a delegate Change-Id: If4f3dca99638015b479509e4aa73e0190b1182ac Task-number: QTBUG-67343 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-05-22 13:40:06 +00:00
function test_comboBoxWithShaderEffect() {
var control = createTemporaryObject(comboBoxWithShaderEffect, testCase, {model: 9})
verify(control)
waitForRendering(control)
control.forceActiveFocus()
var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"})
verify(openedSpy.valid)
var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"})
verify(closedSpy.valid)
control.popup.open()
openedSpy.wait()
compare(openedSpy.count, 1)
control.popup.close()
closedSpy.wait()
compare(closedSpy.count, 1)
}
ComboBox: add selectTextByMouse property Allows configuring the selectByMouse property of the underlying TextField for editable combo boxes. Named selectTextByMouse instead of selectByMouse to avoid confusion with selection of the items themselves. [ChangeLog][Controls][ComboBox] Added selectTextByMouse property. Change-Id: I852e4cd44ebe6b2a1ed2535513ea2fc35cbe0a32 Fixes: QTBUG-71406 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-12-11 15:38:14 +00:00
function test_comboBoxSelectTextByMouse() {
let control = createTemporaryObject(comboBox, testCase,
{ editable: true, selectTextByMouse: true, model: [ "Some text" ], width: parent.width })
verify(control)
waitForRendering(control)
control.forceActiveFocus()
// Position the text cursor at the beginning of the text.
mouseClick(control, control.leftPadding, control.height / 2)
// Select all of the text.
mousePress(control, control.leftPadding, control.height / 2)
mouseMove(control, control.leftPadding + control.contentItem.width, control.height / 2)
mouseRelease(control, control.leftPadding + control.contentItem.width, control.height / 2)
compare(control.contentItem.selectedText, "Some text")
}
Merge remote-tracking branch 'origin/5.14' into 5.15 Conflicts: .qmake.conf tests/auto/controls/data/tst_combobox.qml Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
2019-12-30 10:44:50 +00:00
ComboBox: change currentIndex (if applicable) when focus is lost When the user enters text into an editable ComboBox that matches the text of an entry in the model, and then tabs out to another item, the currentIndex should be changed to that entry. This brings the behavior of ComboBox in line with QComboBox. Change-Id: Ibb1e201a503704681ebcbc7135d1964cc1f6bbca Fixes: QTBUG-78885 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-12-06 12:13:51 +00:00
// QTBUG-78885: When the edit text is changed on an editable ComboBox,
// and then that ComboBox loses focus, its currentIndex should change
// to the index of the edit text (assuming a match is found).
function test_currentIndexChangeOnLostFocus() {
Controls: replace Qt.styleHints with Application.styleHints As mentioned in QTBUG-95540, using the latter provides better type information for tooling, and avoids the "this property only exists on the object if Quick has been imported" issue. Replace QtQml import in Fluent style's Config.qml with QtQuick to provide access to the Application type. Fixes: QTBUG-126512 Pick-to: 6.5 6.7 6.8 Change-Id: I4aac22e54f3b522f74acafd467ce22139352c9dd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2024-06-20 06:58:33 +00:00
if (Application.styleHints.tabFocusBehavior !== Qt.TabFocusAllControls)
ComboBox: change currentIndex (if applicable) when focus is lost When the user enters text into an editable ComboBox that matches the text of an entry in the model, and then tabs out to another item, the currentIndex should be changed to that entry. This brings the behavior of ComboBox in line with QComboBox. Change-Id: Ibb1e201a503704681ebcbc7135d1964cc1f6bbca Fixes: QTBUG-78885 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-12-06 12:13:51 +00:00
skip("This platform only allows tab focus for text controls")
let theModel = []
for (let i = 0; i < 10; ++i)
theModel.push("Item " + (i + 1))
let comboBox1 = createTemporaryObject(comboBox, testCase,
{ objectName: "comboBox1", editable: true, model: theModel })
verify(comboBox1)
compare(comboBox1.currentIndex, 0)
let comboBox2 = createTemporaryObject(comboBox, testCase, { objectName: "comboBox2" })
verify(comboBox2)
// Give the first ComboBox focus and type in 0 to select "Item 10" (default is "Item 1").
waitForRendering(comboBox1)
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
comboBox1.contentItem.forceActiveFocus()
ComboBox: change currentIndex (if applicable) when focus is lost When the user enters text into an editable ComboBox that matches the text of an entry in the model, and then tabs out to another item, the currentIndex should be changed to that entry. This brings the behavior of ComboBox in line with QComboBox. Change-Id: Ibb1e201a503704681ebcbc7135d1964cc1f6bbca Fixes: QTBUG-78885 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-12-06 12:13:51 +00:00
verify(comboBox1.activeFocus)
keyClick(Qt.Key_0)
compare(comboBox1.editText, "Item 10")
let currentIndexSpy = signalSpy.createObject(comboBox1,
{ target: comboBox1, signalName: "currentIndexChanged" })
verify(currentIndexSpy.valid)
// Give focus to the other ComboBox so that the first one loses it.
// The first ComboBox's currentIndex should change to that of "Item 10".
keyClick(Qt.Key_Tab)
verify(comboBox2.activeFocus)
compare(comboBox1.currentIndex, 9)
compare(currentIndexSpy.count, 1)
// Give focus back to the first ComboBox, and try the same thing except
// with non-existing text; the currentIndex should not change.
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
comboBox1.contentItem.forceActiveFocus()
ComboBox: change currentIndex (if applicable) when focus is lost When the user enters text into an editable ComboBox that matches the text of an entry in the model, and then tabs out to another item, the currentIndex should be changed to that entry. This brings the behavior of ComboBox in line with QComboBox. Change-Id: Ibb1e201a503704681ebcbc7135d1964cc1f6bbca Fixes: QTBUG-78885 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-12-06 12:13:51 +00:00
verify(comboBox1.activeFocus)
keySequence(StandardKey.SelectAll)
compare(comboBox1.contentItem.selectedText, "Item 10")
keyClick(Qt.Key_N)
keyClick(Qt.Key_O)
keyClick(Qt.Key_P)
keyClick(Qt.Key_E)
compare(comboBox1.editText, "nope")
compare(comboBox1.currentIndex, 9)
compare(currentIndexSpy.count, 1)
}
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
readonly property font testFont: ({
family: "Arial",
pixelSize: 12
})
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
Component {
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
id: fixedFontTextFieldComponent
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
TextField {
objectName: "appFontTextField"
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
font: testCase.testFont
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
// We don't want the background's implicit width to interfere with our tests,
// which are about implicit width of the contentItem of ComboBox, which is by default TextField.
background: null
}
}
Component {
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
id: fixedFontContentItemComboBoxComponent
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
ComboBox {
// Override the contentItem so that the font doesn't vary between styles.
contentItem: TextField {
objectName: "appFontContentItemTextField"
// We do this just to be extra sure that the font never comes from the control,
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
// as we want it to match that of the TextField in the fixedFontTextFieldComponent.
font: testCase.testFont
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
background: null
}
}
}
Component {
id: twoItemListModelComponent
ListModel {
ListElement { display: "Short" }
ListElement { display: "Kinda long" }
}
}
function appendedToModel(model, item) {
if (Array.isArray(model)) {
let newModel = model
newModel.push(item)
return newModel
}
if (model.hasOwnProperty("append")) {
model.append({ display: item })
// To account for the fact that changes to a JS array are not seen by the QML engine,
// we need to reassign the entire model and hence return it. For simplicity in the
// calling code, we do it for the ListModel code path too. It should be a no-op.
return model
}
console.warn("appendedToModel: unrecognised model")
return undefined
}
function removedFromModel(model, index, count) {
if (Array.isArray(model)) {
let newModel = model
newModel.splice(index, count)
return newModel
}
if (model.hasOwnProperty("remove")) {
model.remove(index, count)
return model
}
console.warn("removedFromModel: unrecognised model")
return undefined
}
// We don't use a data-driven test for the policy because the checks vary a lot based on which enum we're testing.
function test_implicitContentWidthPolicy_ContentItemImplicitWidth() {
// Set ContentItemImplicitWidth and ensure that implicitContentWidth is as wide as the current item
// by comparing it against the implicitWidth of an identical TextField
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let control = createTemporaryObject(fixedFontContentItemComboBoxComponent, testCase, {
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
model: ["Short", "Kinda long"],
implicitContentWidthPolicy: ComboBox.ContentItemImplicitWidth
})
verify(control)
compare(control.implicitContentWidthPolicy, ComboBox.ContentItemImplicitWidth)
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let textField = createTemporaryObject(fixedFontTextFieldComponent, testCase)
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
verify(textField)
// Don't set any text on textField because we're not accounting for the widest
// text here, so we want to compare it against an empty TextField.
compare(control.implicitContentWidth, textField.implicitWidth)
textField.font.pixelSize *= 2
control.font.pixelSize *= 2
compare(control.implicitContentWidth, textField.implicitWidth)
}
function test_implicitContentWidthPolicy_WidestText_data() {
return [
{ tag: "Array", model: ["Short", "Kinda long"] },
{ tag: "ListModel", model: twoItemListModelComponent.createObject(testCase) },
]
}
function test_implicitContentWidthPolicy_WidestText(data) {
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let control = createTemporaryObject(fixedFontContentItemComboBoxComponent, testCase, {
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
model: data.model,
implicitContentWidthPolicy: ComboBox.WidestText
})
verify(control)
compare(control.implicitContentWidthPolicy, ComboBox.WidestText)
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let textField = createTemporaryObject(fixedFontTextFieldComponent, testCase)
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
verify(textField)
textField.text = "Kinda long"
// Note that we don't need to change the current index here, as the implicitContentWidth
// is set to the implicitWidth of the TextField within the ComboBox as if it had the largest
// text from the model set on it.
// We use Math.ceil because TextInput uses qCeil internally, whereas the implicitWidth
// binding for TextField does not.
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Add a longer item; it should affect the implicit content width.
let modifiedModel = appendedToModel(data.model, "Moderately long")
control.model = modifiedModel
textField.text = "Moderately long"
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Remove the last two items; it should use the only remaining item's width.
modifiedModel = removedFromModel(data.model, 1, 2)
control.model = modifiedModel
compare(control.count, 1)
compare(control.currentText, "Short")
textField.text = "Short"
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Changes in font should result in the implicitContentWidth being updated.
textField.font.pixelSize *= 2
// We have to change the contentItem's font size manually since we break the
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
// style's binding to the control's font when we set the fixed font on it.
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
control.contentItem.font.pixelSize *= 2
control.font.pixelSize *= 2
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
}
function test_implicitContentWidthPolicy_WidestTextWhenCompleted_data() {
return test_implicitContentWidthPolicy_WidestText_data()
}
function test_implicitContentWidthPolicy_WidestTextWhenCompleted(data) {
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let control = createTemporaryObject(fixedFontContentItemComboBoxComponent, testCase, {
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
model: data.model,
implicitContentWidthPolicy: ComboBox.WidestTextWhenCompleted
})
verify(control)
compare(control.implicitContentWidthPolicy, ComboBox.WidestTextWhenCompleted)
Fix warnings in tst_combobox.qml Qt.application.font may have its pointSize set, whereas the test uses pixelSize. Setting both results in a warning. Use a more predictable hard-coded font for this purpose. Fixes: QTBUG-119644 Pick-to: 6.5 6.7 Change-Id: I951dec3ca1c72ea5b6b9b607b90963f901e1ba9d Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
2024-05-21 06:43:24 +00:00
let textField = createTemporaryObject(fixedFontTextFieldComponent, testCase)
ComboBox: add implicitContentWidthPolicy [ChangeLog][Controls][ComboBox] Added implicitContentWidthPolicy, which controls how the implicitContentWidth of the ComboBox is calculated. This can be used to automatically ensure that text is not elided. Fixes: QTBUG-78281 Change-Id: If669fa4ef05e5da498992843469000ef39c335ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2020-02-27 14:36:20 +00:00
verify(textField)
textField.text = "Kinda long"
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Add a longer item; it should not affect the implicit content width
// since we've already accounted for it once.
let modifiedModel = appendedToModel(data.model, "Moderately long")
control.model = modifiedModel
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Remove the last two items; it should still not affect the implicit content width.
modifiedModel = removedFromModel(data.model, 1, 2)
control.model = modifiedModel
compare(control.count, 1)
compare(control.currentText, "Short")
compare(Math.ceil(control.implicitContentWidth), Math.ceil(textField.implicitWidth))
// Changes in font should not result in the implicitContentWidth being updated.
let oldTextFieldImplicitWidth = textField.implicitWidth
// Changes in font should result in the implicitContentWidth being updated.
textField.font.pixelSize *= 2
control.contentItem.font.pixelSize *= 2
control.font.pixelSize *= 2
compare(Math.ceil(control.implicitContentWidth), Math.ceil(oldTextFieldImplicitWidth))
}
ComboBox: don't focus TextField when clicking on indicator Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-01-21 08:52:45 +00:00
// QTBUG-61021: text line should not be focused by default
// It causes (e.g. on Android) showing virtual keyboard when it is not needed
function test_doNotFocusTextLineByDefault() {
var control = createTemporaryObject(comboBox, testCase)
// Focus not set after creating combobox
verify(!control.activeFocus)
verify(!control.contentItem.focus)
// After setting focus on combobox, text line should not be focused
control.forceActiveFocus()
verify(control.activeFocus)
verify(!control.contentItem.focus)
// Text line is focused after intentional setting focus on it
control.contentItem.forceActiveFocus()
verify(control.activeFocus)
verify(control.contentItem.focus)
}
QQuickComboBox: fix acceptableInput being wrong if no validator was set This patch fixes an issue with hasAcceptableInput(), if the property would be read before the contentItem had been set by the qml engine. This would cause hasAcceptableInput to return false by default, even though the default value is supposed to be true, if no validators or inputMasks are being used. The solution that I've chosen, is to give the QQuickComboBox its own acceptableInput variable, and connect the contentItem's acceptableInputChanged() signal to a function that polls for the contentItem property, and updates its variable accordingly. Fixes: QTBUG-94307 Pick-to: 6.2 6.1 5.15 Change-Id: I587d76162e75544a7ed1df9e3b9104bd73013bb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-06-11 12:06:57 +00:00
Component {
id: intValidatorComponent
IntValidator {
bottom: 0
top: 255
}
}
function test_acceptableInput_QTBUG_94307() {
let items = [
{ text: "A" },
{ text: "2" },
{ text: "3" }
]
let control = createTemporaryObject(comboBox, testCase, {model: items, editable: true})
verify(control)
verify(control.acceptableInput)
compare(control.displayText, "A")
let acceptableInputSpy = signalSpy.createObject(control, {target: control, signalName: "acceptableInputChanged"})
verify(acceptableInputSpy.valid)
let intValidator = intValidatorComponent.createObject(testCase)
verify(intValidator)
control.validator = intValidator
compare(acceptableInputSpy.count, 1)
compare(control.displayText, "A")
compare(control.acceptableInput, false)
control.currentIndex = 1
compare(acceptableInputSpy.count, 2)
compare(control.displayText, "2")
compare(control.acceptableInput, true)
}
ComboBox: clear selection when text that matches existing item accepted When typing "B" in the text field of an editable ComboBox whose model contains "Apple", "Banana" and "Coconut", and then hitting Enter, any selected text should be cleared. This is how widgets behaves, and also how ComboBox already behaves when typing a lowercase "b". Change-Id: I18f28d246a7853280b2e2d3b4288278b9dd45ebb Fixes: QTBUG-75197 Pick-to: 6.2 6.3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-04-27 13:12:33 +00:00
function test_selectionCleared() {
const model = [
{ text: "Apple" },
{ text: "Banana" },
{ text: "Coconut" }
]
let control = createTemporaryObject(comboBox, testCase, { model: model, editable: true })
verify(control)
compare(control.displayText, "Apple")
compare(control.editText, "Apple")
compare(control.currentIndex, 0)
// Give the TextField focus and select the text.
let textField = control.contentItem
textField.forceActiveFocus()
textField.selectAll()
compare(textField.selectedText, "Apple")
// Type "B" so that Banana is selected.
keyPress(Qt.Key_Shift)
keyClick(Qt.Key_B)
keyRelease(Qt.Key_Shift)
compare(control.displayText, "Apple")
expectFail("", "QTBUG-102950")
compare(control.editText, "Banana")
compare(textField.selectedText, "anana")
compare(control.currentIndex, 0)
// Select Banana by pressing enter.
keyClick(Qt.Key_Return)
compare(control.displayText, "Banana")
compare(control.editText, "Banana")
compare(textField.selectedText, "")
compare(control.currentIndex, 1)
}
Generalize role selection mechanism from QQuickComboBox We can have QQmlDelegateModel pick specific roles from model items. That can easily be done for variant maps, variant hashes, objects and gadgets. We would like to do it for anything that has a QMetaAssociation, but as we cannot get to the original type at that place, it's currently not possible. The special case about variant maps with exactly one item in variant lists is clearly insane and therefore not included in the generalization. This requires some cleanup in the QQmlGadgetPointerWrapper. Passing the wrapper itself to QMetaProperty::read() has always been a rather obscure way of reading from the gadget. Pick-to: 6.3 Fixes: QTBUG-102983 Change-Id: I84ecef980783e7137aa4d77070ddce47b6ead260 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-05-06 07:57:07 +00:00
ComboBox: don't open on key release unless press was handled If a Keys handler eats the press of the activation key, then the release event shouldn't show the popup. The default keyPressEvent handler sets the pressed state to true, so we can test that state to see if we should act on the corresponding release. The key release event should still be accepted to stop propagation. Add a test case. Pick-to: 6.5 6.2 Fixes: QTBUG-109721 Change-Id: Icb76453733d05cba59fdfb365b0cebf710be5f01 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2023-04-17 19:11:16 +00:00
// QTBUG-109721 - verify that an eaten press event for the space key
// doesn't open the popup when the key is released.
Component {
id: comboboxEatsSpace
ComboBox {
id: nonEditableComboBox
editable: false
model: ["NonEditable", "Delta", "Echo", "Foxtrot"]
Keys.onSpacePressed: (event) => event.accept
}
}
function test_spacePressEaten() {
let control = createTemporaryObject(comboboxEatsSpace, testCase)
verify(control)
control.forceActiveFocus()
var visibleChangedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "visibleChanged"})
verify(visibleChangedSpy.valid)
// press doesn't open
keyPress(Qt.Key_Space)
verify(!control.pressed)
compare(visibleChangedSpy.count, 0)
// neither does release
keyRelease(Qt.Key_Space)
compare(visibleChangedSpy.count, 0)
}
Generalize role selection mechanism from QQuickComboBox We can have QQmlDelegateModel pick specific roles from model items. That can easily be done for variant maps, variant hashes, objects and gadgets. We would like to do it for anything that has a QMetaAssociation, but as we cannot get to the original type at that place, it's currently not possible. The special case about variant maps with exactly one item in variant lists is clearly insane and therefore not included in the generalization. This requires some cleanup in the QQmlGadgetPointerWrapper. Passing the wrapper itself to QMetaProperty::read() has always been a rather obscure way of reading from the gadget. Pick-to: 6.3 Fixes: QTBUG-102983 Change-Id: I84ecef980783e7137aa4d77070ddce47b6ead260 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-05-06 07:57:07 +00:00
Component {
id: listOfGadgets
QtObject {
property list<rect> rects: [Qt.rect(1, 2, 3, 4), Qt.rect(5, 6, 7, 8)]
}
}
function test_listOfGadgetsWithRole() {
let model = listOfGadgets.createObject(testCase);
let control = createTemporaryObject(
comboBox, testCase, {model: model.rects, textRole: "width"});
verify(control);
compare(control.currentIndex, 0);
compare(control.displayText, "3");
control.currentIndex = 1;
compare(control.displayText, "7");
}
Models: Fix condition for context object As shown in the ComboBox test, it is possible for a context object to coexist with required properties. We have to check if the context object is the same as the model object. Amends commit e9f650cad82e7eff2234cdf2d37bb9b1bb25d27d Task-number: QTBUG-111176 Task-number: QTBUG-110980 Task-number: QTBUG-104752 Change-Id: Idfee277b5c3b78c514b2d239d73fcb6809577678 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
2023-04-26 07:14:37 +00:00
function test_contextObject() {
Models: Make all model roles available for array models This includes various kinds of objects in lists of various kinds. We just dynamically create a metaobject that includes all keys we've seen so far. For example, you can now pass an array of JavaScript objects as model to a ComboBox and it will retrieve the correct textRole: ComboBox { model: [ { name: "Apple", color: "red" }, { name: "Orange", color: "orange" }, { name: "Banana", color: "yellow" } ] textRole: "color" } This will create the entries "red", "orange", and "yellow". Amends commit 86794e82ea92cff3b36bbb58f813b625f0230e51. Change-Id: I3df1f0b43ca1496f7eaed1165731d871c354ac1a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-02-28 11:27:15 +00:00
// We use the default delegate with required properties and pass
// an array of objects as model. This should work despite
// ComboBox setting itself as model object for the delegate.
let control = createTemporaryObject(
comboBox, testCase, {model: fruitarray, textRole: "color"});
verify(control);
compare(control.popup.contentItem.itemAtIndex(0).text, "red");
Models: Fix condition for context object As shown in the ComboBox test, it is possible for a context object to coexist with required properties. We have to check if the context object is the same as the model object. Amends commit e9f650cad82e7eff2234cdf2d37bb9b1bb25d27d Task-number: QTBUG-111176 Task-number: QTBUG-110980 Task-number: QTBUG-104752 Change-Id: Idfee277b5c3b78c514b2d239d73fcb6809577678 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
2023-04-26 07:14:37 +00:00
// Now we pass an AbstractItemModel with 2 roles. Since we use required properties
// the model object should still have the anonymous property, and it should be a
// QQmlDMAbstractItemModelData.
Models: Make all model roles available for array models This includes various kinds of objects in lists of various kinds. We just dynamically create a metaobject that includes all keys we've seen so far. For example, you can now pass an array of JavaScript objects as model to a ComboBox and it will retrieve the correct textRole: ComboBox { model: [ { name: "Apple", color: "red" }, { name: "Orange", color: "orange" }, { name: "Banana", color: "yellow" } ] textRole: "color" } This will create the entries "red", "orange", and "yellow". Amends commit 86794e82ea92cff3b36bbb58f813b625f0230e51. Change-Id: I3df1f0b43ca1496f7eaed1165731d871c354ac1a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-02-28 11:27:15 +00:00
control = createTemporaryObject(comboBox, testCase, { model: fruitmodel });
Models: Fix condition for context object As shown in the ComboBox test, it is possible for a context object to coexist with required properties. We have to check if the context object is the same as the model object. Amends commit e9f650cad82e7eff2234cdf2d37bb9b1bb25d27d Task-number: QTBUG-111176 Task-number: QTBUG-110980 Task-number: QTBUG-104752 Change-Id: Idfee277b5c3b78c514b2d239d73fcb6809577678 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
2023-04-26 07:14:37 +00:00
verify(control);
for (var i = 0; i < 3; ++i)
ignoreWarning(/ComboBox\.qml\:[0-9]+\:[0-9]+\: Unable to assign QQmlDMAbstractItemModelData to QString/);
compare(control.popup.contentItem.itemAtIndex(0).text, "");
}
Add ComboBox Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-26 17:02:15 +00:00
}