Evas textblock: Make the ellipsis format the same as the surrounding.

This fix is based on a solution by WooHyun Jung.

diff --git a/ChangeLog b/ChangeLog
index 200a6fe2f33f9633c6296f3cc19f59bbaa391dea..4d4b51852b950a90c88dc18efa55a5c9b5d561ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-08  Tom Hacohen
+
+       * Evas textblock:  Make the ellipsis format the same as the surrounding.
+
 2013-08-07  Tom Hacohen
 
        * Evas textblock: Use max ascent/descent at the edges of the textblock.

diff --git a/NEWS b/NEWS
index 0a6f9fcac51b1d541601e0e8abdb6dfcec26142a..c71743488373b6c32ebcd30259cfefef258c04a0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ Additions:
      - Use eina_file_virtualize() for evas_object_image_memfile_set().
      - Change mapping policy for image loader.
      - textblock: Use max ascent/descent at the edges of the textblock.
+     - textblock: Make the ellipsis format the same as the surrounding.
     * Ecore_X:
      - Add window profile support.
        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 ec58bf6de1184d9fa3d7871590b635fffd84b785..9dfb7b066398ccc45dacb597e40ec1920f76fb04 100644 (file)
--- 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)
 
    /* We can free it here, cause there's only one ellipsis item per tb. */
    if (c->o->ellip_ti) _item_free(c->obj, NULL, _ITEM(c->o->ellip_ti));
-   c->o->ellip_ti = ellip_ti = _layout_text_item_new(c,
-         eina_list_data_get(eina_list_last(c->format_stack)));
+   c->o->ellip_ti = ellip_ti = _layout_text_item_new(c, cur_it->format);
    ellip_ti->parent.text_node = cur_it->text_node;
    ellip_ti->parent.text_pos = cur_it->text_pos;
    script = evas_common_language_script_type_get(_ellip_str, len);