Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #80699 from aXu-AP/spin-box-comma-decimals

Browse source 
Allow comma as a decimal separator for SpinBox
This commit is contained in:
Yuri Sizov 2023-09-28 20:04:02 +02:00
commit 4f0e2ea86e
2 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
editor/gui/editor_spin_slider.cpp
View file

@ -525,18 +525,25 @@ String EditorSpinSlider::get_suffix() const {
} }
void EditorSpinSlider::_evaluate_input_text() { void EditorSpinSlider::_evaluate_input_text() {
// Replace comma with dot to support it as decimal separator (GH-6028).
// This prevents using functions like `pow()`, but using functions
// in EditorSpinSlider is a barely known (and barely used) feature.
// Instead, we'd rather support German/French keyboard layouts out of the box.
const String text = TS->parse_number(value_input->get_text().replace(",", "."));
Ref<Expression> expr; Ref<Expression> expr;
expr.instantiate(); expr.instantiate();
// Convert commas ',' to dots '.' for French/German etc. keyboard layouts.
String text = value_input->get_text().replace(",", ".");
text = text.replace(";", ",");
text = TS->parse_number(text);
Error err = expr->parse(text); Error err = expr->parse(text);
if (err != OK) {
// If the expression failed try without converting commas to dots - they might have been for parameter separation.
text = value_input->get_text();
text = TS->parse_number(text);
err = expr->parse(text);
if (err != OK) { if (err != OK) {
return; return;
} }
}
Variant v = expr->execute(Array(), nullptr, false, true); Variant v = expr->execute(Array(), nullptr, false, true);
if (v.get_type() == Variant::NIL) { if (v.get_type() == Variant::NIL) {

18
scene/gui/spin_box.cpp
View file

@ -62,13 +62,25 @@ void SpinBox::_text_submitted(const String &p_string) {
Ref<Expression> expr; Ref<Expression> expr;
expr.instantiate(); expr.instantiate();
String num = TS->parse_number(p_string); // Convert commas ',' to dots '.' for French/German etc. keyboard layouts.
String text = p_string.replace(",", ".");
text = text.replace(";", ",");
text = TS->parse_number(text);
// Ignore the prefix and suffix in the expression. // Ignore the prefix and suffix in the expression.
Error err = expr->parse(num.trim_prefix(prefix + " ").trim_suffix(" " + suffix)); text = text.trim_prefix(prefix + " ").trim_suffix(" " + suffix);
Error err = expr->parse(text);
if (err != OK) {
// If the expression failed try without converting commas to dots - they might have been for parameter separation.
text = p_string;
text = TS->parse_number(text);
text = text.trim_prefix(prefix + " ").trim_suffix(" " + suffix);
err = expr->parse(text);
if (err != OK) { if (err != OK) {
_update_text();
return; return;
} }
}
Variant value = expr->execute(Array(), nullptr, false, true); Variant value = expr->execute(Array(), nullptr, false, true);
if (value.get_type() != Variant::NIL) { if (value.get_type() != Variant::NIL) {