godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #102775 from KoBeWi/😐

Browse Source 
Fix inspector follow focus when child is focused
This commit is contained in:
Thaddeus Crews
2025-02-14 08:25:38 -06:00
parent b2aae7b729 286d3ae415
commit 40ff57e2a0
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
editor/editor_inspector.cpp
View File

@@ -4465,6 +4465,14 @@ 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() { void EditorInspector::_update_current_favorites() {
current_favorites.clear(); current_favorites.clear();
if (!can_favorite) { if (!can_favorite) {
@@ -4662,6 +4670,10 @@ void EditorInspector::_notification(int p_what) {
if (!is_sub_inspector()) { if (!is_sub_inspector()) {
get_tree()->connect("node_removed", callable_mp(this, &EditorInspector::_node_removed)); 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; } break;
case NOTIFICATION_PREDELETE: { case NOTIFICATION_PREDELETE: {
@@ -4744,15 +4756,6 @@ void EditorInspector::_notification(int p_what) {
update_tree(); update_tree();
} }
} break; } break;
case NOTIFICATION_FOCUS_ENTER: {
set_follow_focus(true);
} break;
case NOTIFICATION_FOCUS_EXIT: {
// Don't follow focus when the inspector is not focused. Prevents potential jumping when gaining focus.
set_follow_focus(false);
} break;
} }
} }

1
editor/editor_inspector.h
View File

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

2
scene/gui/scroll_container.h
View File

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