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

Merge pull request #112251 from bruvzg/grab_ac

Browse Source 
Fix `grab_focus` incorrectly handling `FOCUS_ACCESSIBILITY`.
This commit is contained in:
Rémi Verschelde
2025-11-01 19:06:12 +01:00
parent 1962e7d058 8e626d5103
commit ba125108eb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/control.cpp
View File

@@ -2349,6 +2349,13 @@ void Control::grab_focus(bool p_hide_focus) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
ERR_FAIL_COND(!is_inside_tree()); ERR_FAIL_COND(!is_inside_tree());
if (get_focus_mode_with_override() == FOCUS_ACCESSIBILITY) {
if (!get_tree()->is_accessibility_enabled()) {
WARN_PRINT("This control can grab focus only when screen reader is active. Use set_focus_mode() and set_focus_behavior_recursive() to allow a control to get focus. Use get_tree().is_accessibility_enabled() to check screen-reader state.");
return;
}
}
if (get_focus_mode_with_override() == FOCUS_NONE) { if (get_focus_mode_with_override() == FOCUS_NONE) {
WARN_PRINT("This control can't grab focus. Use set_focus_mode() and set_focus_behavior_recursive() to allow a control to get focus."); WARN_PRINT("This control can't grab focus. Use set_focus_mode() and set_focus_behavior_recursive() to allow a control to get focus.");
return; return;