godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Fix FOCUS_ACCESSIBILITY grabbing focus when it is not supposed to, forward GraphNode key input to GraphEdit.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-04-20 20:30:34 +03:00
parent e37c6261ea
commit db0c0a9182
6 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/control.cpp
View File

@@ -2158,6 +2158,11 @@ Control::FocusBehaviorRecursive Control::get_focus_behavior_recursive() const {
return data.focus_behavior_recursive;
}
bool Control::_is_focusable() const {
bool ac_enabled = is_inside_tree() && get_tree()->is_accessibility_enabled();
return (is_visible_in_tree() && ((get_focus_mode_with_override() == FOCUS_ALL) || (get_focus_mode_with_override() == FOCUS_CLICK) || (ac_enabled && get_focus_mode_with_override() == FOCUS_ACCESSIBILITY)));
}
bool Control::_is_focus_mode_enabled() const {
if (data.focus_behavior_recursive == FOCUS_BEHAVIOR_INHERITED) {
if (data.parent_control) {
@@ -2270,7 +2275,7 @@ Control *Control::find_next_valid_focus() const {
ERR_FAIL_NULL_V_MSG(n, nullptr, "Next focus node path is invalid: '" + data.focus_next + "'.");
Control *c = Object::cast_to<Control>(n);
ERR_FAIL_NULL_V_MSG(c, nullptr, "Next focus node is not a control: '" + n->get_name() + "'.");
if (c->is_visible_in_tree() && c->get_focus_mode_with_override() != FOCUS_NONE) {
if (c->_is_focusable()) {
return c;
}
}
@@ -2374,7 +2379,7 @@ Control *Control::find_prev_valid_focus() const {
ERR_FAIL_NULL_V_MSG(n, nullptr, "Previous focus node path is invalid: '" + data.focus_prev + "'.");
Control *c = Object::cast_to<Control>(n);
ERR_FAIL_NULL_V_MSG(c, nullptr, "Previous focus node is not a control: '" + n->get_name() + "'.");
if (c->is_visible_in_tree() && c->get_focus_mode_with_override() != FOCUS_NONE) {
if (c->_is_focusable()) {
return c;
}
}
@@ -2494,7 +2499,7 @@ Control *Control::_get_focus_neighbor(Side p_side, int p_count) {
ERR_FAIL_NULL_V_MSG(n, nullptr, "Neighbor focus node path is invalid: '" + data.focus_neighbor[p_side] + "'.");
Control *c = Object::cast_to<Control>(n);
ERR_FAIL_NULL_V_MSG(c, nullptr, "Neighbor focus node is not a control: '" + n->get_name() + "'.");
if (c->is_visible_in_tree() && c->get_focus_mode_with_override() != FOCUS_NONE) {
if (c->_is_focusable()) {
return c;
}

1
scene/gui/control.h
View File

@@ -337,6 +337,7 @@ private:
// Focus.
bool _is_focusable() const;
void _window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, const Rect2 &p_rect, const Rect2 &p_clamp, real_t p_min, real_t &r_closest_dist_squared, Control **r_closest);
Control *_get_focus_neighbor(Side p_side, int p_count = 0);
bool _is_focus_mode_enabled() const;

4
scene/gui/graph_edit.cpp
View File

@@ -2263,6 +2263,10 @@ void GraphEdit::gui_input(const Ref<InputEvent> &p_ev) {
}
}
key_input(p_ev);
}
void GraphEdit::key_input(const Ref<InputEvent> &p_ev) {
if (p_ev->is_pressed()) {
if (p_ev->is_action("ui_graph_duplicate", true)) {
emit_signal(SNAME("duplicate_nodes_request"));

2
scene/gui/graph_edit.h
View File

@@ -401,6 +401,8 @@ public:
PackedStringArray get_configuration_warnings() const override;
void key_input(const Ref<InputEvent> &p_ev);
// This method has to be public (for undo redo).
// TODO: Find a better way to do this.
void _update_graph_frame(GraphFrame *p_frame);

5
scene/gui/graph_element.cpp
View File

@@ -173,6 +173,11 @@ void GraphElement::gui_input(const Ref<InputEvent> &p_ev) {
emit_signal(SNAME("resize_request"), resizing_from_size + diff);
}
GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
if (graph && has_focus()) {
graph->key_input(p_ev);
}
}
void GraphElement::set_resizable(bool p_enable) {

2
scene/main/viewport.cpp
View File

@@ -1933,7 +1933,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
while (ci) {
Control *control = Object::cast_to<Control>(ci);
if (control) {
if (control->get_focus_mode_with_override() != Control::FOCUS_NONE) {
if (control->_is_focusable()) {
// Grabbing unhovered focus can cause issues when mouse is dragged
// with another button held down.
if (control != gui.key_focus && gui.mouse_over_hierarchy.has(control)) {