Skip to content

[Accessibility] Do not use activation/deactivation callbacks for embedded windows. #117322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Repiteo merged 1 commit into from
Mar 11, 2026
+18 −6
Merged

[Accessibility] Do not use activation/deactivation callbacks for embedded windows. #117322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions scene/main/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,12 +957,16 @@ void Window::hide() {

void Window::_accessibility_activate() {
_accessibility_notify_enter(this);
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
if (!get_embedder()) {
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
}
}

void Window::_accessibility_deactivate() {
_accessibility_notify_exit(this);
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
if (!get_embedder()) {
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
}
}

void Window::_accessibility_notify_enter(Node *p_node) {
Expand Down Expand Up @@ -1054,12 +1058,16 @@ void Window::set_visible(bool p_visible) {
if (get_tree() && get_tree()->is_accessibility_supported()) {
get_tree()->_accessibility_force_update();
_accessibility_notify_enter(this);
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
if (!embedder_vp) {
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
}
}
} else {
if (get_tree() && get_tree()->is_accessibility_supported()) {
_accessibility_notify_exit(this);
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
if (!embedder_vp) {
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
}
}
focused = false;
if (focused_window == this) {
Expand Down Expand Up @@ -1676,7 +1684,9 @@ void Window::_notification(int p_what) {
if (window_id != DisplayServerEnums::MAIN_WINDOW_ID && get_tree() && get_tree()->is_accessibility_supported()) {
get_tree()->_accessibility_force_update();
_accessibility_notify_enter(this);
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
if (!embedder) {
AccessibilityServer::get_singleton()->window_activation_completed(get_window_id());
}
}
notification(NOTIFICATION_VISIBILITY_CHANGED);
emit_signal(SceneStringName(visibility_changed));
Expand Down Expand Up @@ -1731,7 +1741,9 @@ void Window::_notification(int p_what) {
if (visible && window_id != DisplayServerEnums::MAIN_WINDOW_ID) {
if (get_tree() && get_tree()->is_accessibility_supported()) {
_accessibility_notify_exit(this);
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
if (!embedder) {
AccessibilityServer::get_singleton()->window_deactivation_completed(get_window_id());
}
if (get_parent()) {
get_parent()->queue_accessibility_update();
}
Expand Down
Loading