From a4ff25485c09fb2a8a2ed09fb02b64bc8390c198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tyrychtr?= Date: Thu, 8 Feb 2024 09:53:55 +0100 Subject: [PATCH 1/2] a11y: Expose AT-SPI Text on a bare GTkText Previously, only EditableText was exposed, which does not make much sense. Fixes https://gitlab.gnome.org/GNOME/libadwaita/-/issues/798 --- gtk/a11y/gtkatspitext.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/a11y/gtkatspitext.c b/gtk/a11y/gtkatspitext.c index 385b5cad68..2655563160 100644 --- a/gtk/a11y/gtkatspitext.c +++ b/gtk/a11y/gtkatspitext.c @@ -691,6 +691,9 @@ gtk_editable_get_text_widget (GtkWidget *widget) if (GTK_IS_TEXT (delegate)) return GTK_TEXT (delegate); + + if (GTK_IS_TEXT( widget)) + return GTK_TEXT (widget); } return NULL; @@ -1574,8 +1577,7 @@ gtk_atspi_get_text_vtable (GtkAccessible *accessible) return &label_vtable; else if (GTK_IS_INSCRIPTION (accessible)) return &inscription_vtable; - else if (GTK_IS_EDITABLE (accessible) && - GTK_IS_TEXT (gtk_editable_get_delegate (GTK_EDITABLE (accessible)))) + else if (GTK_IS_EDITABLE (accessible)) return &editable_vtable; else if (GTK_IS_TEXT_VIEW (accessible)) return &text_view_vtable; From f9ba19c4de9438fd419b8bb2d941951c3fd4cae0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Feb 2024 01:50:06 +0000 Subject: [PATCH 2/2] Apply review feedback --- gtk/a11y/gtkatspitext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/a11y/gtkatspitext.c b/gtk/a11y/gtkatspitext.c index 2655563160..bf7c3016ea 100644 --- a/gtk/a11y/gtkatspitext.c +++ b/gtk/a11y/gtkatspitext.c @@ -692,7 +692,7 @@ gtk_editable_get_text_widget (GtkWidget *widget) if (GTK_IS_TEXT (delegate)) return GTK_TEXT (delegate); - if (GTK_IS_TEXT( widget)) + if (GTK_IS_TEXT (widget)) return GTK_TEXT (widget); }