feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Handle keyboard accept and reject operations in RealSpinBox

Browse Source 
Fixes: QDS-11748
Change-Id: Id8770ffc1ab2057f4003d8734bf21b2f6c5a11ad
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
This commit is contained in:
Ali Kianian
2024-12-20 11:20:21 +02:00
parent 3aa10944a1
commit fad001766c
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBox.qml
View File

@@ -188,6 +188,18 @@ T.SpinBox {
} }
onTextEdited: control.dirty = true onTextEdited: control.dirty = true
Keys.onPressed: (event) => {
if (event.key === Qt.Key_Enter) {
let inputValue = control.valueFromAnyText(spinBoxInput.text, control.locale)
control.setRealValue(inputValue)
spinBoxInput.focus = false
} else if (event.key === Qt.Key_Escape) {
let controlText = control.textFromAnyValue(control.realValue, control.locale)
spinBoxInput.text = controlText
spinBoxInput.focus = false
}
}
} }
background: Rectangle { background: Rectangle {
@@ -226,14 +238,11 @@ T.SpinBox {
} }
textFromValue: function (value, locale) { textFromValue: function (value, locale) {
locale.numberOptions = Locale.OmitGroupSeparator return control.textFromAnyValue(control.realValue, locale)
var decimals = trailingZeroes ? control.decimals : decimalCounter(value)
return Number(control.realValue).toLocaleString(locale, 'f', decimals)
} }
valueFromText: function (text, locale) { valueFromText: function (text, locale) {
control.setRealValue(Number.fromLocaleString(locale, spinBoxInput.text)) control.setRealValue(control.valueFromAnyText(spinBoxInput.text, locale))
return 0 return 0
} }
@@ -436,4 +445,14 @@ T.SpinBox {
return Math.min(index, control.decimals); return Math.min(index, control.decimals);
} }
function textFromAnyValue(value: real, locale: var) : string {
locale.numberOptions = Locale.OmitGroupSeparator
var decimals = control.trailingZeroes ? control.decimals : control.decimalCounter(value)
return Number(value).toLocaleString(locale, 'f', decimals)
}
function valueFromAnyText(text: string, locale: var) : var {
return Number.fromLocaleString(locale, text)
}
} }