Cleanup accessibility names.

This commit is contained in:
Pāvels Nadtočajevs 2025-06-12 07:55:29 +03:00
parent 242b8ff80a
commit a272376f89
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
97 changed files with 188 additions and 440 deletions

View file

@ -191,10 +191,13 @@ void Button::_notification(int p_what) {
RID ae = get_accessibility_element();
ERR_FAIL_COND(ae.is_null());
if (!xl_text.is_empty() && get_accessibility_name().is_empty()) {
const String &ac_name = get_accessibility_name();
if (!xl_text.is_empty() && ac_name.is_empty()) {
DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text);
} else if (!xl_text.is_empty() && !get_accessibility_name().is_empty() && get_accessibility_name() != xl_text) {
DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_accessibility_name() + ": " + xl_text);
} else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) {
DisplayServer::get_singleton()->accessibility_update_set_name(ae, ac_name + ": " + xl_text);
} else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) {
DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_tooltip_text()); // Fall back to tooltip.
}
AcceptDialog *dlg = Object::cast_to<AcceptDialog>(get_parent());
if (dlg && dlg->get_ok_button() == this) {