diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-09-09 16:22:08 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-09-09 16:22:08 +0000 |
commit | 30098118b3604ea4568e29e19b65f69abebcbba3 (patch) | |
tree | d6d43021e3a539629a2c3cd8cc0689d5feb724bd | |
parent | 51433afc9665216594269dbf5f080f8a1094ba82 (diff) | |
parent | c997214620d80adc0b1794b42a9e79ce856d9df2 (diff) | |
download | atk-30098118b3604ea4568e29e19b65f69abebcbba3.tar.gz |
Merge branch 'union_undefined' into 'master'
Make atk_text_rectangle_union ignore undefined rectangles
See merge request GNOME/atk!25
-rw-r--r-- | atk/atktext.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/atk/atktext.c b/atk/atktext.c index c15ea78..52d7da1 100644 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -1331,6 +1331,23 @@ atk_text_rectangle_union (AtkTextRectangle *src1, { gint dest_x, dest_y; + /* + * Some invocations of e.g. atk_text_get_character_extents + * may return "-1" rectangles for character positions without support for + * getting an extent. In that case we have to ignore them instead of using -1 + * values in computations. + */ + if (src1->width == -1) + { + *dest = *src2; + return; + } + if (src2->width == -1) + { + *dest = *src1; + return; + } + dest_x = MIN (src1->x, src2->x); dest_y = MIN (src1->y, src2->y); dest->width = MAX (src1->x + src1->width, src2->x + src2->width) - dest_x; |