Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #103316 from Rindbee/make-EditorProperty-and-its-children-behave-like-sibling-nodes

Browse source 
Make `EditorProperty` and its child `EditorProperty` behave like sibling nodes when handling mouse events
This commit is contained in:
Thaddeus Crews 2025-03-05 12:08:02 -06:00
commit 0544ed3ff4
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
6 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/classes/EditorInspector.xml
View file

@ -51,6 +51,7 @@
<members>
<member name="draw_focus_border" type="bool" setter="set_draw_focus_border" getter="get_draw_focus_border" overrides="ScrollContainer" default="true" />
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
<member name="follow_focus" type="bool" setter="set_follow_focus" getter="is_following_focus" overrides="ScrollContainer" default="true" />
<member name="horizontal_scroll_mode" type="int" setter="set_horizontal_scroll_mode" getter="get_horizontal_scroll_mode" overrides="ScrollContainer" enum="ScrollContainer.ScrollMode" default="0" />
</members>
<signals>

23
editor/editor_inspector.cpp
View file

@ -918,6 +918,9 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
if (me.is_valid()) {
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()) {
mpos.x = get_size().x - mpos.x;
}
@ -2715,8 +2718,6 @@ VBoxContainer *EditorInspectorArray::get_vbox(int p_index) {
EditorInspectorArray::EditorInspectorArray(bool p_read_only) {
read_only = p_read_only;
set_mouse_filter(Control::MOUSE_FILTER_STOP);
odd_style.instantiate();
even_style.instantiate();
@ -3046,7 +3047,6 @@ void EditorInspector::update_tree() {
int current_focusable = -1;
// Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating.
bool was_following = get_root_inspector()->is_following_focus();
get_root_inspector()->set_follow_focus(false);
if (property_focusable != -1) {
@ -3075,7 +3075,7 @@ void EditorInspector::update_tree() {
_clear(!object);
if (!object) {
get_root_inspector()->set_follow_focus(was_following);
get_root_inspector()->set_follow_focus(true);
return;
}
@ -3956,7 +3956,7 @@ void EditorInspector::update_tree() {
EditorNode::get_singleton()->hide_unused_editors();
}
get_root_inspector()->set_follow_focus(was_following);
get_root_inspector()->set_follow_focus(true);
}
void EditorInspector::update_property(const String &p_prop) {
@ -4530,14 +4530,6 @@ void EditorInspector::_node_removed(Node *p_node) {
}
}
void EditorInspector::_gui_focus_changed(Control *p_control) {
if (!is_visible_in_tree() && !is_following_focus()) {
return;
}
// Don't follow focus when the inspector nor any of its children is focused. Prevents potential jumping when gaining focus.
set_follow_focus(has_focus() || child_has_focus());
}
void EditorInspector::_update_current_favorites() {
current_favorites.clear();
if (!can_favorite) {
@ -4735,10 +4727,6 @@ void EditorInspector::_notification(int p_what) {
if (!is_sub_inspector()) {
get_tree()->connect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
}
Viewport *viewport = get_viewport();
ERR_FAIL_NULL(viewport);
viewport->connect("gui_focus_changed", callable_mp(this, &EditorInspector::_gui_focus_changed));
} break;
case NOTIFICATION_PREDELETE: {
@ -4977,6 +4965,7 @@ EditorInspector::EditorInspector() {
base_vbox->add_child(main_vbox);
set_horizontal_scroll_mode(SCROLL_MODE_DISABLED);
set_follow_focus(true);
changing = 0;
search_box = nullptr;

1
editor/editor_inspector.h
View file

@ -606,7 +606,6 @@ class EditorInspector : public ScrollContainer {
void _clear_current_favorites();
void _node_removed(Node *p_node);
void _gui_focus_changed(Control *p_control);
HashMap<StringName, int> per_array_page;
void _page_change_request(int p_new_page, const StringName &p_array_prefix);

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_draw_focus_border(false);
sub_inspector->set_focus_mode(FocusMode::FOCUS_NONE);
sub_inspector->set_use_filter(use_filter);
sub_inspector->register_text_enter(parent_inspector->search_box);
sub_inspector->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(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) {
container = memnew(PanelContainer);
container->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(container);
set_bottom_editor(container);
@ -1208,7 +1207,6 @@ void EditorPropertyDictionary::update_property() {
if (!container) {
container = memnew(PanelContainer);
container->set_mouse_filter(MOUSE_FILTER_STOP);
add_child(container);
set_bottom_editor(container);

2
scene/gui/scroll_container.h
View file

@ -82,6 +82,7 @@ private:
bool draw_focus_border = false;
bool focus_border_is_drawn = false;
bool child_has_focus();
protected:
Size2 get_minimum_size() const override;
@ -98,7 +99,6 @@ protected:
public:
virtual void gui_input(const Ref<InputEvent> &p_gui_input) override;
bool child_has_focus();
void set_h_scroll(int p_pos);
int get_h_scroll() const;