tasn pushed a commit to branch evas-1.7.

commit 5bfb0a5633e470e73a0a124f163922f06749cb31
Author: Tom Hacohen <[email protected]>
Date:   Thu Aug 8 13:16:01 2013 +0100

    Textblock: Make the ellipsis format the same as the surrounding.
---
 ChangeLog                              | 5 +++++
 NEWS                                   | 1 +
 src/lib/canvas/evas_object_textblock.c | 3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ee755a..b3c6e74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1339,3 +1339,8 @@
 2013-08-02  Eduardo Lima (Etrunko)
 
         * 1.7.8 release
+
+2013-07-08  Tom Hacohen
+
+        * Evas textblock: Make the ellipsis format the same as the surrounding.
+
diff --git a/NEWS b/NEWS
index e692fc9..2e068e0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Changes since Evas 1.7.8:
 
 Fixes:
    * Evas textblock: Fixed issue when parsing formats with quotes.
+   * Evas textblock: Make the ellipsis format the same as the surrounding.
 
 Evas 1.7.8
 
diff --git a/src/lib/canvas/evas_object_textblock.c 
b/src/lib/canvas/evas_object_textblock.c
index 2c0e01f..dfde5aa 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -4129,8 +4129,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);

-- 

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk

Reply via email to