diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-26 16:36:32 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-29 07:35:26 +0000 |
| commit | cf67efa1ea63fe11504799b9bb2329f70d99c525 (patch) | |
| tree | 024fbb692210f044da403dfc8554d0b5f216766c /src/imports/controls/SpinBox.qml | |
| parent | e4721fa68c5426d71e957dc6997753ec85f312af (diff) | |
SpinBox: add validator, textFromValue and valueFromText
Change-Id: I45e01199453ac5fd64b7f98c165cc12eeb0ce8c3
Task-number: QTBUG-48989
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Diffstat (limited to 'src/imports/controls/SpinBox.qml')
| -rw-r--r-- | src/imports/controls/SpinBox.qml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 3607a701..5aeebe78 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -54,9 +54,17 @@ T.SpinBox { leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) rightPadding: 6 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + //! [validator] + validator: IntValidator { + locale: control.locale.name + bottom: Math.min(control.from, control.to) + top: Math.max(control.from, control.to) + } + //! [validator] + //! [contentItem] contentItem: TextInput { - text: Number(control.value).toLocaleString(control.locale, 'f', 0) + text: control.textFromValue(control.value, control.locale) font: control.font color: control.Theme.textColor @@ -65,10 +73,7 @@ T.SpinBox { horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter - validator: IntValidator { - bottom: Math.min(control.from, control.to) - top: Math.max(control.from, control.to) - } + validator: control.validator inputMethodHints: Qt.ImhFormattedNumbersOnly } //! [contentItem] |