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

Make EditorProperty and its child EditorProperties behave more like sibling nodes

Browse source 
Let `EditorProperty::gui_input()` no longer handle mouse events that
occur in the child EditorProperty rect.

(cherry picked from commit 62aa4a6f9e)
This commit is contained in:
风青山 2025-02-26 17:46:40 +08:00 • committed by Rémi Verschelde
parent ba27815166
commit 72ad4a2f36
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/editor_inspector.cpp
View file

@ -918,6 +918,9 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
if (me.is_valid()) { if (me.is_valid()) {
Vector2 mpos = me->get_position(); Vector2 mpos = me->get_position();
if (bottom_child_rect.has_point(mpos)) {
return; // Makes child EditorProperties behave like sibling nodes when handling mouse events.
}
if (is_layout_rtl()) { if (is_layout_rtl()) {
mpos.x = get_size().x - mpos.x; mpos.x = get_size().x - mpos.x;
} }
@ -2715,8 +2718,6 @@ VBoxContainer *EditorInspectorArray::get_vbox(int p_index) {
EditorInspectorArray::EditorInspectorArray(bool p_read_only) { EditorInspectorArray::EditorInspectorArray(bool p_read_only) {
read_only = p_read_only; read_only = p_read_only;
set_mouse_filter(Control::MOUSE_FILTER_STOP);
odd_style.instantiate(); odd_style.instantiate();
even_style.instantiate(); even_style.instantiate();

2
editor/editor_properties.cpp
View file

@ -3303,11 +3303,11 @@ void EditorPropertyResource::update_property() {
sub_inspector->set_use_folding(is_using_folding()); sub_inspector->set_use_folding(is_using_folding());
sub_inspector->set_draw_focus_border(false); sub_inspector->set_draw_focus_border(false);
sub_inspector->set_focus_mode(FocusMode::FOCUS_NONE);
sub_inspector->set_use_filter(use_filter); sub_inspector->set_use_filter(use_filter);
sub_inspector->register_text_enter(parent_inspector->search_box); sub_inspector->register_text_enter(parent_inspector->search_box);
sub_inspector->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(sub_inspector); add_child(sub_inspector);
set_bottom_editor(sub_inspector); set_bottom_editor(sub_inspector);

2
editor/editor_properties_array_dict.cpp
View file

@ -430,7 +430,6 @@ void EditorPropertyArray::update_property() {
if (!container) { if (!container) {
container = memnew(PanelContainer); container = memnew(PanelContainer);
container->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(container); add_child(container);
set_bottom_editor(container); set_bottom_editor(container);
@ -1208,7 +1207,6 @@ void EditorPropertyDictionary::update_property() {
if (!container) { if (!container) {
container = memnew(PanelContainer); container = memnew(PanelContainer);
container->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(container); add_child(container);
set_bottom_editor(container); set_bottom_editor(container);