summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2012-08-14 12:40:41 +0000
committerTom Hacohen <tom@stosb.com>2012-08-14 12:40:41 +0000
commitfc94d7b16860a25a845eeea07d6f6487058f581a (patch)
tree706751b15f9da34efcc27450a07549974f762fe4 /legacy/evas
parent54650e7e5615f171f0c9e63c2f145e03be3289dd (diff)
Evas textblock: Fixed range geometry when the last item is a format.
SVN revision: 75257
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/ChangeLog4
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textblock.c12
2 files changed, 14 insertions, 2 deletions
diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 3dc79f04cf..3ad64c7e0c 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -957,3 +957,7 @@
9572012-08-13 Carsten Haitzler (The Rasterman) 9572012-08-13 Carsten Haitzler (The Rasterman)
958 958
959 * Fix async fd stuff to generate new pipe after a fork (pid mismatch) 959 * Fix async fd stuff to generate new pipe after a fork (pid mismatch)
960
9612012-08-14 Tom Hacohen (TAsn)
962
963 * Textblock: Fixed range geometry when the last item is a format.
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0426bf367b..4428257a02 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -8928,8 +8928,16 @@ _evas_textblock_cursor_range_in_line_geometry_get(
8928 } 8928 }
8929 else 8929 else
8930 { 8930 {
8931 x = 0; 8931 if (end > 0)
8932 w = it2->w; 8932 {
8933 x = it2->adv;
8934 w = 0;
8935 }
8936 else
8937 {
8938 x = 0;
8939 w = it2->adv;
8940 }
8933 _evas_textblock_range_calc_x_w(it2, &x, &w, EINA_FALSE, 8941 _evas_textblock_range_calc_x_w(it2, &x, &w, EINA_FALSE,
8934 switch_items); 8942 switch_items);
8935 } 8943 }