asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67397 from KoBeWi/impostorpup

Browse source 
Change EditorSpinSlider's popup to Control
This commit is contained in:
Rémi Verschelde 2022-11-15 13:22:51 +01:00
commit 22b19bbdeb
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/editor_spin_slider.cpp
View file

@ -619,11 +619,9 @@ bool EditorSpinSlider::is_grabbing() const {
void EditorSpinSlider::_focus_entered() { void EditorSpinSlider::_focus_entered() {
_ensure_input_popup(); _ensure_input_popup();
Rect2 gr = get_screen_rect();
value_input->set_text(get_text_value()); value_input->set_text(get_text_value());
value_input_popup->set_position(gr.position); value_input_popup->set_size(get_size());
value_input_popup->set_size(gr.size); value_input_popup->call_deferred(SNAME("show"));
value_input_popup->call_deferred(SNAME("popup"));
value_input->call_deferred(SNAME("grab_focus")); value_input->call_deferred(SNAME("grab_focus"));
value_input->call_deferred(SNAME("select_all")); value_input->call_deferred(SNAME("select_all"));
value_input->set_focus_next(find_next_valid_focus()->get_path()); value_input->set_focus_next(find_next_valid_focus()->get_path());
@ -658,14 +656,13 @@ void EditorSpinSlider::_ensure_input_popup() {
return; return;
} }
value_input_popup = memnew(Popup); value_input_popup = memnew(Control);
add_child(value_input_popup); add_child(value_input_popup);
value_input = memnew(LineEdit); value_input = memnew(LineEdit);
value_input_popup->add_child(value_input); value_input_popup->add_child(value_input);
value_input_popup->set_wrap_controls(true);
value_input->set_anchors_and_offsets_preset(PRESET_FULL_RECT); value_input->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
value_input_popup->connect("popup_hide", callable_mp(this, &EditorSpinSlider::_value_input_closed)); value_input_popup->connect("hidden", callable_mp(this, &EditorSpinSlider::_value_input_closed));
value_input->connect("text_submitted", callable_mp(this, &EditorSpinSlider::_value_input_submitted)); value_input->connect("text_submitted", callable_mp(this, &EditorSpinSlider::_value_input_submitted));
value_input->connect("focus_exited", callable_mp(this, &EditorSpinSlider::_value_focus_exited)); value_input->connect("focus_exited", callable_mp(this, &EditorSpinSlider::_value_focus_exited));
value_input->connect("gui_input", callable_mp(this, &EditorSpinSlider::_value_input_gui_input)); value_input->connect("gui_input", callable_mp(this, &EditorSpinSlider::_value_input_gui_input));

2
editor/editor_spin_slider.h
View file

@ -63,7 +63,7 @@ class EditorSpinSlider : public Range {
Vector2 grabbing_spinner_mouse_pos; Vector2 grabbing_spinner_mouse_pos;
double pre_grab_value = 0.0; double pre_grab_value = 0.0;
Popup *value_input_popup = nullptr; Control *value_input_popup = nullptr;
LineEdit *value_input = nullptr; LineEdit *value_input = nullptr;
bool value_input_just_closed = false; bool value_input_just_closed = false;
bool value_input_dirty = false; bool value_input_dirty = false;