Skip to content

Commit 5b2d73f

Browse files
committed
Make EditorProperty and its child EditorProperties behave more like sibling nodes
Let `EditorProperty::gui_input()` no longer handle mouse events that occur in the child EditorProperty rect.
1 parent d0437d5 commit 5b2d73f

3 files changed

+4
-6
lines changed

editor/editor_inspector.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,9 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
918918

919919
if (me.is_valid()) {
920920
Vector2 mpos = me->get_position();
921+
if (bottom_child_rect.has_point(mpos)) {
922+
return; // Makes child EditorProperties behave like sibling nodes.
923+
}
921924
if (is_layout_rtl()) {
922925
mpos.x = get_size().x - mpos.x;
923926
}
@@ -2715,8 +2718,6 @@ VBoxContainer *EditorInspectorArray::get_vbox(int p_index) {
27152718
EditorInspectorArray::EditorInspectorArray(bool p_read_only) {
27162719
read_only = p_read_only;
27172720

2718-
set_mouse_filter(Control::MOUSE_FILTER_STOP);
2719-
27202721
odd_style.instantiate();
27212722
even_style.instantiate();
27222723

editor/editor_properties.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3302,12 +3302,11 @@ void EditorPropertyResource::update_property() {
33023302
sub_inspector->set_read_only(is_read_only());
33033303
sub_inspector->set_use_folding(is_using_folding());
33043304

3305-
sub_inspector->set_draw_focus_border(false);
3305+
sub_inspector->set_focus_mode(FocusMode::FOCUS_NONE);
33063306

33073307
sub_inspector->set_use_filter(use_filter);
33083308
sub_inspector->register_text_enter(parent_inspector->search_box);
33093309

3310-
sub_inspector->set_mouse_filter(MOUSE_FILTER_STOP);
33113310
add_child(sub_inspector);
33123311
set_bottom_editor(sub_inspector);
33133312

editor/editor_properties_array_dict.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ void EditorPropertyArray::update_property() {
430430

431431
if (!container) {
432432
container = memnew(PanelContainer);
433-
container->set_mouse_filter(MOUSE_FILTER_STOP);
434433
add_child(container);
435434
set_bottom_editor(container);
436435

@@ -1208,7 +1207,6 @@ void EditorPropertyDictionary::update_property() {
12081207

12091208
if (!container) {
12101209
container = memnew(PanelContainer);
1211-
container->set_mouse_filter(MOUSE_FILTER_STOP);
12121210
add_child(container);
12131211
set_bottom_editor(container);
12141212

0 commit comments

Comments
 (0)