summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec9d038b24..3dc7c28258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-11-19 Tom Hacohen
2
3 * Evas textblock: Fixed order of tags inserted with markup_app/prepend.
4
12013-11-05 Youngbok Shin 52013-11-05 Youngbok Shin
2 6
3 * Edje: Add null checking for name of anchor and item in geometry get functions. 7 * Edje: Add null checking for name of anchor and item in geometry get functions.
diff --git a/NEWS b/NEWS
index e24caaacac..6a1f8bdb01 100644
--- a/NEWS
+++ b/NEWS
@@ -360,7 +360,7 @@ Fixes:
360 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself. 360 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself.
361 - Fixed the textblock format to be drawn according to the glyph's horizontal advance width. 361 - Fixed the textblock format to be drawn according to the glyph's horizontal advance width.
362 - Fixed the textblock set to context with the textblock object's render operation. 362 - Fixed the textblock set to context with the textblock object's render operation.
363 363 - Evas textblock: Fixed order of tags inserted with markup_app/prepend.
364 * Ecore: 364 * Ecore:
365 - Don't leak fd on exec. 365 - Don't leak fd on exec.
366 - Fix fd handler increase issue when ecore_pipe_add/del is called repeatedly. 366 - Fix fd handler increase issue when ecore_pipe_add/del is called repeatedly.
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 4194aac385..64a2ac2693 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -8578,6 +8578,7 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *form
8578 } 8578 }
8579 else 8579 else
8580 { 8580 {
8581 fmt = _evas_textblock_node_format_last_at_off(fmt);
8581 if (evas_textblock_cursor_format_is_visible_get(cur)) 8582 if (evas_textblock_cursor_format_is_visible_get(cur))
8582 { 8583 {
8583 o->format_nodes = _NODE_FORMAT(eina_inlist_prepend_relative( 8584 o->format_nodes = _NODE_FORMAT(eina_inlist_prepend_relative(
@@ -8593,7 +8594,6 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *form
8593 } 8594 }
8594 else 8595 else
8595 { 8596 {
8596 fmt = _evas_textblock_node_format_last_at_off(fmt);
8597 o->format_nodes = _NODE_FORMAT(eina_inlist_append_relative( 8597 o->format_nodes = _NODE_FORMAT(eina_inlist_append_relative(
8598 EINA_INLIST_GET(o->format_nodes), 8598 EINA_INLIST_GET(o->format_nodes),
8599 EINA_INLIST_GET(n), 8599 EINA_INLIST_GET(n),