mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-14 14:20:21 +00:00
Merge branch 'remove_a11y_name_fallback' into 'main'
Don't present GTK class names to assistive technologies even as a fallback Closes gnome-control-center#2244 See merge request GNOME/gtk!5365
This commit is contained in:
commit
b6596d5313
@ -902,31 +902,6 @@ gtk_at_context_get_accessible_relation (GtkATContext *self,
|
|||||||
return gtk_accessible_attribute_set_get_value (self->relations, relation);
|
return gtk_accessible_attribute_set_get_value (self->relations, relation);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
is_structural_role (GtkAccessibleRole role)
|
|
||||||
{
|
|
||||||
/* Keep the switch small while avoiding the compiler warning for
|
|
||||||
* unhandled enumeration values
|
|
||||||
*/
|
|
||||||
switch ((int) role)
|
|
||||||
{
|
|
||||||
case GTK_ACCESSIBLE_ROLE_FORM:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_GROUP:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_GENERIC:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_LANDMARK:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_LIST_ITEM:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_REGION:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_SEARCH:
|
|
||||||
case GTK_ACCESSIBLE_ROLE_SEPARATOR:
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* See the WAI-ARIA § 4.3, "Accessible Name and Description Computation" */
|
/* See the WAI-ARIA § 4.3, "Accessible Name and Description Computation" */
|
||||||
static void
|
static void
|
||||||
gtk_at_context_get_name_accumulate (GtkATContext *self,
|
gtk_at_context_get_name_accumulate (GtkATContext *self,
|
||||||
@ -998,13 +973,6 @@ gtk_at_context_get_name_accumulate (GtkATContext *self,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This fallback is in place only for unlabelled elements */
|
|
||||||
if (names->len != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* Ignore structural elements, namely: generic containers */
|
|
||||||
if (self->accessible != NULL && !is_structural_role (role))
|
|
||||||
g_ptr_array_add (names, (char *)G_OBJECT_TYPE_NAME (self->accessible));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user