godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases 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
parent 813cd1dfc8 4d3dc0e944
commit 4f0e2ea86e
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
editor/gui/editor_spin_slider.cpp
View File

@@ -525,17 +525,24 @@ String EditorSpinSlider::get_suffix() const {
}
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;
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);
if (err != OK) {
return;
// 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) {
return;
}
}
Variant v = expr->execute(Array(), nullptr, false, true);