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

Merge pull request #67814 from opl-/fix/editor-inspector-accept-event

Browse source 
Fix editor inspector classes not accepting events
This commit is contained in:
Rémi Verschelde 2022-11-29 16:48:03 +01:00
commit 447f6998b1
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_inspector.cpp
View file

@ -660,6 +660,7 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
} }
if (keying_rect.has_point(mpos)) { if (keying_rect.has_point(mpos)) {
accept_event();
emit_signal(SNAME("property_keyed"), property, use_keying_next()); emit_signal(SNAME("property_keyed"), property, use_keying_next());
if (use_keying_next()) { if (use_keying_next()) {
@ -683,10 +684,12 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
} }
} }
if (delete_rect.has_point(mpos)) { if (delete_rect.has_point(mpos)) {
accept_event();
emit_signal(SNAME("property_deleted"), property); emit_signal(SNAME("property_deleted"), property);
} }
if (revert_rect.has_point(mpos)) { if (revert_rect.has_point(mpos)) {
accept_event();
bool is_valid_revert = false; bool is_valid_revert = false;
Variant revert_value = EditorPropertyRevert::get_property_revert_value(object, property, &is_valid_revert); Variant revert_value = EditorPropertyRevert::get_property_revert_value(object, property, &is_valid_revert);
ERR_FAIL_COND(!is_valid_revert); ERR_FAIL_COND(!is_valid_revert);
@ -695,11 +698,13 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
} }
if (check_rect.has_point(mpos)) { if (check_rect.has_point(mpos)) {
accept_event();
checked = !checked; checked = !checked;
queue_redraw(); queue_redraw();
emit_signal(SNAME("property_checked"), property, checked); emit_signal(SNAME("property_checked"), property, checked);
} }
} else if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) { } else if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) {
accept_event();
_update_popup(); _update_popup();
menu->set_position(get_screen_position() + get_local_mouse_position()); menu->set_position(get_screen_position() + get_local_mouse_position());
menu->reset_size(); menu->reset_size();
@ -1482,6 +1487,8 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
return; return;
} }
accept_event();
bool should_unfold = !object->editor_is_section_unfolded(section); bool should_unfold = !object->editor_is_section_unfolded(section);
if (should_unfold) { if (should_unfold) {
unfold(); unfold();
@ -1680,6 +1687,7 @@ void EditorInspectorArray::_panel_gui_input(Ref<InputEvent> p_event, int p_index
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid()) { if (mb.is_valid()) {
if (movable && mb->get_button_index() == MouseButton::RIGHT) { if (movable && mb->get_button_index() == MouseButton::RIGHT) {
array_elements[p_index].panel->accept_event();
popup_array_index_pressed = begin_array_index + p_index; popup_array_index_pressed = begin_array_index + p_index;
rmb_popup->set_item_disabled(OPTION_MOVE_UP, popup_array_index_pressed == 0); rmb_popup->set_item_disabled(OPTION_MOVE_UP, popup_array_index_pressed == 0);
rmb_popup->set_item_disabled(OPTION_MOVE_DOWN, popup_array_index_pressed == count - 1); rmb_popup->set_item_disabled(OPTION_MOVE_DOWN, popup_array_index_pressed == count - 1);