Merge branch 'matthiasc/for-main' into 'main'

inspector: Fix accessibility calls

See merge request GNOME/gtk!5154
This commit is contained in:
Matthias Clasen 2022-10-21 02:28:02 +00:00
commit 4549172825
3 changed files with 6 additions and 6 deletions

View File

@ -637,7 +637,7 @@ finished_loading_cb (GtkFileSystemModel *model,
completion = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
update_inline_completion (chooser_entry);
if (gtk_widget_has_focus (GTK_WIDGET (chooser_entry)))
if (gtk_widget_has_focus (GTK_WIDGET (gtk_entry_get_text_widget (GTK_ENTRY (chooser_entry)))))
{
gtk_entry_completion_complete (completion);
gtk_entry_completion_insert_prefix (completion);

View File

@ -1259,13 +1259,13 @@ property_editor (GObject *object,
g_strdup_printf ("%s: %s",
self->name,
gtk_label_get_text (GTK_LABEL (prop_edit))),
NULL);
-1);
}
else
{
gtk_accessible_update_property (GTK_ACCESSIBLE (prop_edit),
GTK_ACCESSIBLE_PROPERTY_LABEL, self->name,
NULL);
-1);
}
return prop_edit;

View File

@ -72,7 +72,7 @@ add_string (GtkInspectorStrvEditor *editor,
gtk_editable_set_text (GTK_EDITABLE (entry), str);
gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
GTK_ACCESSIBLE_PROPERTY_LABEL, _("Value"),
NULL);
-1);
gtk_widget_show (entry);
gtk_box_append (GTK_BOX (box), entry);
g_object_set_data (G_OBJECT (box), "entry", entry);
@ -83,7 +83,7 @@ add_string (GtkInspectorStrvEditor *editor,
gtk_accessible_update_property (GTK_ACCESSIBLE (button),
GTK_ACCESSIBLE_PROPERTY_LABEL,
g_strdup_printf (_("Remove %s"), str),
NULL);
-1);
gtk_widget_show (button);
gtk_box_append (GTK_BOX (box), button);
g_signal_connect (button, "clicked", G_CALLBACK (remove_string), editor);
@ -116,7 +116,7 @@ gtk_inspector_strv_editor_init (GtkInspectorStrvEditor *editor)
gtk_widget_set_halign (editor->button, GTK_ALIGN_END);
gtk_accessible_update_property (GTK_ACCESSIBLE (editor->button),
GTK_ACCESSIBLE_PROPERTY_LABEL, _("Add"),
NULL);
-1);
gtk_widget_show (editor->button);
g_signal_connect (editor->button, "clicked", G_CALLBACK (add_cb), editor);