maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge b56fc31c1f into eb98fd9442

Browse source
This commit is contained in:
Zae Chao 2021-11-09 09:14:20 -05:00 committed by GitHub
parent eb98fd9442 b56fc31c1f
commit 2ec58093a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/editor_spin_slider.cpp
View file

@ -538,10 +538,9 @@ void EditorSpinSlider::_value_input_submitted(const String &p_text) {
}
}
//modal_closed signal
//popup_hide signal
void EditorSpinSlider::_value_input_closed() {
_evaluate_input_text();
value_input_just_closed = true;
}
//focus_exited signal
@ -555,7 +554,7 @@ void EditorSpinSlider::_value_focus_exited() {
// focus is not on the same element after the vlalue_input was exited
// -> focus is on next element
// -> TAB was pressed
// -> modal_close was not called
// -> popup_hide was not called
// -> need to close/hide manually
if (!value_input_just_closed) { //value_input_just_closed should do the same
if (value_input_popup) {
@ -606,9 +605,9 @@ void EditorSpinSlider::_focus_entered() {
value_input->set_text(get_text_value());
value_input_popup->set_position(gr.position);
value_input_popup->set_size(gr.size);
value_input_popup->call_deferred(SNAME("popup"));
value_input_popup->popup();
value_input->select_all();
value_input->call_deferred(SNAME("grab_focus"));
value_input->call_deferred(SNAME("select_all"));
value_input->set_focus_next(find_next_valid_focus()->get_path());
value_input->set_focus_previous(find_prev_valid_focus()->get_path());
}
@ -646,7 +645,7 @@ void EditorSpinSlider::_ensure_input_popup() {
value_input->set_anchors_and_offsets_preset(PRESET_WIDE);
value_input_popup->connect("popup_hide", callable_mp(this, &EditorSpinSlider::_value_input_closed));
value_input->connect("text_submitted", callable_mp(this, &EditorSpinSlider::_value_input_submitted));
value_input->connect("focus_exited", callable_mp(this, &EditorSpinSlider::_value_focus_exited));
this->connect("focus_exited", callable_mp(this, &EditorSpinSlider::_value_focus_exited));
value_input->connect("gui_input", callable_mp(this, &EditorSpinSlider::_value_input_gui_input));
if (is_inside_tree()) {