Commit c58290ee authored by Jens Bache-Wiig's avatar Jens Bache-Wiig Committed by The Qt Project
Browse files

Fix initialization value of SpinBox


The maximumValue 99 was enforced on value _before_ we had a chance
to update it. This made it sometimes impossible to get a maximumValue
higher than 99.

Change-Id: Ia07a9271d563fd3496b583757df757c1e7b4ceb5
Reviewed-by: default avatarCaroline Chao <caroline.chao@digia.com>
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent 8c142768
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1
No related merge requests found
Showing with 20 additions and 2 deletions
...@@ -152,6 +152,8 @@ Control { ...@@ -152,6 +152,8 @@ Control {
input.text = value.toFixed(decimals) input.text = value.toFixed(decimals)
} }
/*! \internal */
property bool __initialized: false
/*! \internal */ /*! \internal */
readonly property bool __upEnabled: value != maximumValue; readonly property bool __upEnabled: value != maximumValue;
/*! \internal */ /*! \internal */
...@@ -196,9 +198,13 @@ Control { ...@@ -196,9 +198,13 @@ Control {
/*! \internal */ /*! \internal */
onMinimumValueChanged: input.setValue(value) onMinimumValueChanged: input.setValue(value)
/*! \internal */ /*! \internal */
Component.onCompleted: input.setValue(value) Component.onCompleted: {
__initialized = true;
input.setValue(value)
}
/*! \internal */ /*! \internal */
onValueChanged: input.setValue(value) onValueChanged: if (__initialized) input.setValue(value)
Accessible.name: input.text Accessible.name: input.text
Accessible.role: Accessible.SpinBox Accessible.role: Accessible.SpinBox
......
...@@ -255,6 +255,18 @@ Item { ...@@ -255,6 +255,18 @@ Item {
compare(spinbox.value, spinbox.maximumValue) compare(spinbox.value, spinbox.maximumValue)
} }
function test_initialization_order()
{
var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.0; SpinBox { id: spinbox;" +
"maximumValue: 2000; value: 1000; implicitWidth:80}",
container, '')
compare(spinbox.value, 1000);
spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { minimumValue: -1000 ; value:-1000}',
container, '')
compare(spinbox.value, -1000);
}
function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents
{ {
var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment