summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 200a6fe2f3..4d4b51852b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-08-08 Tom Hacohen
2
3 * Evas textblock: Make the ellipsis format the same as the surrounding.
4
12013-08-07 Tom Hacohen 52013-08-07 Tom Hacohen
2 6
3 * Evas textblock: Use max ascent/descent at the edges of the textblock. 7 * Evas textblock: Use max ascent/descent at the edges of the textblock.
diff --git a/NEWS b/NEWS
index 0a6f9fcac5..c717434883 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ Additions:
59 - Use eina_file_virtualize() for evas_object_image_memfile_set(). 59 - Use eina_file_virtualize() for evas_object_image_memfile_set().
60 - Change mapping policy for image loader. 60 - Change mapping policy for image loader.
61 - textblock: Use max ascent/descent at the edges of the textblock. 61 - textblock: Use max ascent/descent at the edges of the textblock.
62 - textblock: Make the ellipsis format the same as the surrounding.
62 * Ecore_X: 63 * Ecore_X:
63 - Add window profile support. 64 - Add window profile support.
64 ECORE_X_ATOM_E_WINDOW_PROFILE_SUPPORTED 65 ECORE_X_ATOM_E_WINDOW_PROFILE_SUPPORTED
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index ec58bf6de1..9dfb7b0663 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -4206,8 +4206,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it)
4206 4206
4207 /* We can free it here, cause there's only one ellipsis item per tb. */ 4207 /* We can free it here, cause there's only one ellipsis item per tb. */
4208 if (c->o->ellip_ti) _item_free(c->obj, NULL, _ITEM(c->o->ellip_ti)); 4208 if (c->o->ellip_ti) _item_free(c->obj, NULL, _ITEM(c->o->ellip_ti));
4209 c->o->ellip_ti = ellip_ti = _layout_text_item_new(c, 4209 c->o->ellip_ti = ellip_ti = _layout_text_item_new(c, cur_it->format);
4210 eina_list_data_get(eina_list_last(c->format_stack)));
4211 ellip_ti->parent.text_node = cur_it->text_node; 4210 ellip_ti->parent.text_node = cur_it->text_node;
4212 ellip_ti->parent.text_pos = cur_it->text_pos; 4211 ellip_ti->parent.text_pos = cur_it->text_pos;
4213 script = evas_common_language_script_type_get(_ellip_str, len); 4212 script = evas_common_language_script_type_get(_ellip_str, len);