DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix signals adding/removing a11y nodes in Linux. (flutter/engine#31601)

Browse Source
This commit is contained in:
Robert Ancell 2022-03-11 19:50:06 +13:00 committed by GitHub
parent b58e7be9b6
commit 6f6f57f38f
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/src/flutter/shell/platform/linux/fl_accessible_node.cc
View File

@ -121,6 +121,17 @@ static ActionData* get_action(FlAccessibleNode* self, gint index) {
return static_cast<ActionData*>(g_ptr_array_index(self->actions, index));
}
// Checks if [object] is in [children].
static gboolean has_child(GPtrArray* children, AtkObject* object) {
for (guint i = 0; i < children->len; i++) {
if (g_ptr_array_index(children, i) == object) {
return TRUE;
}
}
return FALSE;
}
static void fl_accessible_node_dispose(GObject* object) {
FlAccessibleNode* self = FL_ACCESSIBLE_NODE(object);
@ -340,11 +351,25 @@ void fl_accessible_node_set_children(FlAccessibleNode* self,
GPtrArray* children) {
g_return_if_fail(FL_IS_ACCESSIBLE_NODE(self));
g_ptr_array_remove_range(self->children, 0, self->children->len);
// Remove nodes that are no longer required.
for (guint i = 0; i < self->children->len;) {
AtkObject* object = ATK_OBJECT(g_ptr_array_index(self->children, i));
if (has_child(children, object)) {
i++;
} else {
g_signal_emit_by_name(self, "children-changed::remove", i, object,
nullptr);
g_ptr_array_remove_index(self->children, i);
}
}
// Add new nodes.
for (guint i = 0; i < children->len; i++) {
AtkObject* object = ATK_OBJECT(g_ptr_array_index(children, i));
g_ptr_array_add(self->children, g_object_ref(object));
g_signal_emit_by_name(self, "children-changed::add", i, object, nullptr);
if (!has_child(self->children, object)) {
g_ptr_array_add(self->children, g_object_ref(object));
g_signal_emit_by_name(self, "children-changed::add", i, object, nullptr);
}
}
}