AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

a11y atspi: Reuse helper to translate text coords

Browse Source 
Instead of reimplementing translating coordinates
relative to a GtkAccessible in a way that requires
that the GtkAccessible is a GtkWidget, reuse the
existing helper function
`gtk_at_spi_translate_coordinates_from_accessible`
in the implementations of AT-SPI Text methods
GetCharacterExtents and GetRangeExtents.

This makes the implementation work for non-GtkWidget
GtkAccessibles, adds support for parent-relative
coordinates (ATSPI_COORD_TYPE_PARENT)
and also fixes an issue with incorrect extents
being reported in a quick test with the "Hypertext"
sample from gtk4-demo.

Sample for querying extents in Accerciser's IPython
console for the Hypertext sample previously gave this
result:

    In [39]: acc.queryText().getCharacterExtents(5, pyatspi.XY_WINDOW)
    Out[39]: (58, 20, -53, -1)

Now, a positive width and height are returned as expected and
the result matches the one when using the GTK 3 version
in gtk3-demo:

    In [1]: acc.queryText().getCharacterExtents(5, pyatspi.XY_WINDOW)
    Out[1]: (58, 20, 5, 19)
This commit is contained in:
Michael Weghorn 2024-04-04 12:22:45 +02:00
parent a62831562f
commit c01782b0a9
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/a11y/gtkatspitext.c
View File

@ -371,14 +371,11 @@ accessible_text_handle_method (GDBusConnection *connection,
int offset;
unsigned int coords_type;
graphene_rect_t extents;
graphene_point_t point;
int x, y, w, h;
GtkNative *native;
double nx, ny;
g_variant_get (parameters, "(iu)", &offset, &coords_type);
if (coords_type != ATSPI_COORD_TYPE_WINDOW)
if (coords_type != ATSPI_COORD_TYPE_PARENT && coords_type != ATSPI_COORD_TYPE_WINDOW)
{
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
@ -387,11 +384,7 @@ accessible_text_handle_method (GDBusConnection *connection,
return;
}
native = gtk_widget_get_native (GTK_WIDGET (accessible));
gtk_native_get_surface_transform (native, &nx, &ny);
if (!gtk_accessible_text_get_extents (accessible_text, offset, offset + 1, &extents) ||
!gtk_widget_compute_point (GTK_WIDGET (accessible), GTK_WIDGET (native), &extents.origin, &point))
if (!gtk_accessible_text_get_extents (accessible_text, offset, offset + 1, &extents))
{
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
@ -400,10 +393,9 @@ accessible_text_handle_method (GDBusConnection *connection,
return;
}
x = floor (point.x + nx);
y = floor (point.y + ny);
w = ceilf (extents.size.width) - x;
h = ceilf (extents.size.height) - y;
gtk_at_spi_translate_coordinates_from_accessible(accessible, coords_type, extents.origin.x, extents.origin.y, &x, &y);
w = extents.size.width;
h = extents.size.height;
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(iiii)", x, y, w, h));
}
@ -412,14 +404,11 @@ accessible_text_handle_method (GDBusConnection *connection,
int start, end;
guint coords_type;
graphene_rect_t extents;
graphene_point_t point;
int x, y, w, h;
GtkNative *native;
double nx, ny;
g_variant_get (parameters, "(iiu)", &start, &end, &coords_type);
if (coords_type != ATSPI_COORD_TYPE_WINDOW)
if (coords_type != ATSPI_COORD_TYPE_PARENT && coords_type != ATSPI_COORD_TYPE_WINDOW)
{
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
@ -428,11 +417,7 @@ accessible_text_handle_method (GDBusConnection *connection,
return;
}
native = gtk_widget_get_native (GTK_WIDGET (accessible));
gtk_native_get_surface_transform (native, &nx, &ny);
if (!gtk_accessible_text_get_extents (accessible_text, start, end, &extents) ||
!gtk_widget_compute_point (GTK_WIDGET (accessible), GTK_WIDGET (native), &extents.origin, &point))
if (!gtk_accessible_text_get_extents (accessible_text, start, end, &extents))
{
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
@ -441,10 +426,9 @@ accessible_text_handle_method (GDBusConnection *connection,
return;
}
x = floor (point.x + nx);
y = floor (point.y + ny);
w = ceilf (extents.size.width) - x;
h = ceilf (extents.size.height) - y;
gtk_at_spi_translate_coordinates_from_accessible(accessible, coords_type, extents.origin.x, extents.origin.y, &x, &y);
w = extents.size.width;
h = extents.size.height;
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(iiii)", x, y, w, h));
}