summaryrefslogtreecommitdiff
path: root/src/controls/Private
diff options
context:
space:
mode:
authorFilippo Cucchetto <filippocucchetto@gmail.com>2014-11-19 23:16:42 +0100
committerFilippo Cucchetto <filippocucchetto@gmail.com>2014-11-25 11:35:41 +0100
commitef45995bc59cff6299ca5b10b4acb4840c473172 (patch)
treedf836fea5466b2e43409daa78f06b9867751d46e /src/controls/Private
parentb1141eaa833cfada0d10f68017fb329e68c04869 (diff)
downloadqtquickcontrols-ef45995bc59cff6299ca5b10b4acb4840c473172.tar.gz
Fix Spinbox missing value change if minimumValue is set
The Spinbox validator considered invalid an intermediate value preventing the user for inserting a valid value. Task-number: QTBUG-42342 Change-Id: I24d2f9f7d6fb9d5d4f96f81821b37a30421665a3 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/Private')
-rw-r--r--src/controls/Private/qquickspinboxvalidator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/Private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp
index afbc866c..2fec79e8 100644
--- a/src/controls/Private/qquickspinboxvalidator.cpp
+++ b/src/controls/Private/qquickspinboxvalidator.cpp
@@ -200,7 +200,9 @@ QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) con
bool ok = false;
qreal val = locale().toDouble(value, &ok);
if (ok) {
- if (state == QValidator::Acceptable) {
+ if (state == QValidator::Acceptable ||
+ (state == QValidator::Intermediate && val >= 0 && val <= m_validator.top()) ||
+ (state == QValidator::Intermediate && val < 0 && val >= m_validator.bottom())) {
const_cast<QQuickSpinBoxValidator *>(this)->setValue(val);
if (input != textFromValue(val))
state = QValidator::Intermediate;