From c58290ee7af6f2abcd08cbf319ff6f85b9db9fdb Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Thu, 7 Mar 2013 14:29:15 +0100
Subject: [PATCH] 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: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
src/controls/SpinBox.qml | 10 ++++++++--
tests/auto/controls/data/tst_spinbox.qml | 12 ++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index 4b6d4e851..c82e3410f 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -152,6 +152,8 @@ Control {
input.text = value.toFixed(decimals)
}
+ /*! \internal */
+ property bool __initialized: false
/*! \internal */
readonly property bool __upEnabled: value != maximumValue;
/*! \internal */
@@ -196,9 +198,13 @@ Control {
/*! \internal */
onMinimumValueChanged: input.setValue(value)
/*! \internal */
- Component.onCompleted: input.setValue(value)
+ Component.onCompleted: {
+ __initialized = true;
+ input.setValue(value)
+ }
+
/*! \internal */
- onValueChanged: input.setValue(value)
+ onValueChanged: if (__initialized) input.setValue(value)
Accessible.name: input.text
Accessible.role: Accessible.SpinBox
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index e3105384f..b725b88a0 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -255,6 +255,18 @@ Item {
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
{
var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
--
GitLab