hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2026-03-11 14:44:48 +02:00
parent 847d684314
commit 5f0dd6f683
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scene/main/window.cpp
View file

@ -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) {
@ -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) {
@ -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));
@ -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();
}