tasn pushed a commit to branch master.
commit 1d75dcaf56c5488f2b994698ffd6be82a1dd8585
Author: Tom Hacohen <[email protected]>
Date: Thu Aug 8 13:09:20 2013 +0100
Evas textblock: Make the ellipsis format the same as the surrounding.
This fix is based on a solution by WooHyun Jung.
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/evas/canvas/evas_object_textblock.c | 3 +--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 200a6fe..4d4b518 100644
--- 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 0a6f9fc..c717434 100644
--- 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 ec58bf6..9dfb7b0 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)
/* 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
