tasn pushed a commit to branch evas-1.7.
http://git.enlightenment.org/legacy/evas.git/commit/?id=e79e583a1df233e1362aee1d0c71d414df91d3c3
commit e79e583a1df233e1362aee1d0c71d414df91d3c3
Author: Tom Hacohen <t...@stosb.com>
Date: Tue Nov 19 16:03:41 2013 +0000
Evas textblock: Fixed order of tags inserted with markup_app/prepend.
The order was messed up when inserting a few formats in the
markup_append/prepend functions without any characters between them.
For example, inserting "<b><i>" would result in "<i><b>" being inserted.
Thanks to YoungBok Shin for reporting this.
---
ChangeLog | 5 +++++
NEWS | 5 +++++
src/lib/canvas/evas_object_textblock.c | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ffd03e6..b304180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1370,3 +1370,8 @@
2013-10-18 Eduardo Lima (Etrunko)
* 1.7.9 release
+
+2013-11-18 Tom Hacohen
+
+ * Evas textblock: Fixed order of tags inserted with markup_app/prepend.
+
diff --git a/NEWS b/NEWS
index 47bf529..a82f6d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
Evas 1.7.9
+Changes since Evas 1.7.9:
+-------------------------
+Fixes:
+ * Evas textblock: Fixed order of tags inserted with markup_app/prepend.
+
Changes since Evas 1.7.8:
-------------------------
diff --git a/src/lib/canvas/evas_object_textblock.c
b/src/lib/canvas/evas_object_textblock.c
index 46c5123..5c20cac 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -8271,6 +8271,7 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor
*cur, const char *form
}
else
{
+ fmt = _evas_textblock_node_format_last_at_off(fmt);
if (evas_textblock_cursor_format_is_visible_get(cur))
{
o->format_nodes = _NODE_FORMAT(eina_inlist_prepend_relative(
@@ -8286,7 +8287,6 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor
*cur, const char *form
}
else
{
- fmt = _evas_textblock_node_format_last_at_off(fmt);
o->format_nodes = _NODE_FORMAT(eina_inlist_append_relative(
EINA_INLIST_GET(o->format_nodes),
EINA_INLIST_GET(n),
--
