diff options
author | Tom Hacohen <tom@stosb.com> | 2012-10-30 11:53:58 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2012-10-30 11:53:58 +0000 |
commit | 2bd953a4ab14602e48d683f0877077deef04a645 (patch) | |
tree | 33cd52739bb08d8d5167ec1d5067c14c9cd7df70 /legacy/evas/src | |
parent | 887c2a119056f68a3cf201f5e85215bb49d31a83 (diff) |
Evas textblock: Fixed more tb init issues.
SVN revision: 78644
Diffstat (limited to 'legacy/evas/src')
-rw-r--r-- | legacy/evas/src/lib/canvas/evas_object_textblock.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index cf4db8d508..2775e75cf3 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c | |||
@@ -510,6 +510,7 @@ static void evas_object_textblock_render(Evas_Object *eo_obj, Evas_Object_Protec | |||
510 | static void evas_object_textblock_free(Evas_Object *eo_obj); | 510 | static void evas_object_textblock_free(Evas_Object *eo_obj); |
511 | static void evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); | 511 | static void evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); |
512 | static void evas_object_textblock_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); | 512 | static void evas_object_textblock_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); |
513 | static Evas_Object_Textblock_Node_Text *_evas_textblock_node_text_new(void); | ||
513 | 514 | ||
514 | static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj); | 515 | static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj); |
515 | static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj); | 516 | static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj); |
@@ -682,6 +683,11 @@ _nodes_clear(const Evas_Object *eo_obj) | |||
682 | o->format_nodes = _NODE_FORMAT(eina_inlist_remove(EINA_INLIST_GET(o->format_nodes), EINA_INLIST_GET(n))); | 683 | o->format_nodes = _NODE_FORMAT(eina_inlist_remove(EINA_INLIST_GET(o->format_nodes), EINA_INLIST_GET(n))); |
683 | _evas_textblock_node_format_free(o, n); | 684 | _evas_textblock_node_format_free(o, n); |
684 | } | 685 | } |
686 | |||
687 | o->cursor->node = _evas_textblock_node_text_new(); | ||
688 | o->text_nodes = _NODE_TEXT(eina_inlist_append( | ||
689 | EINA_INLIST_GET(o->text_nodes), | ||
690 | EINA_INLIST_GET(o->cursor->node))); | ||
685 | } | 691 | } |
686 | 692 | ||
687 | /** | 693 | /** |
@@ -5180,7 +5186,6 @@ _textblock_text_markup_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) | |||
5180 | } | 5186 | } |
5181 | 5187 | ||
5182 | evas_textblock_cursor_paragraph_first(o->cursor); | 5188 | evas_textblock_cursor_paragraph_first(o->cursor); |
5183 | evas_textblock_cursor_text_append(o->cursor, ""); | ||
5184 | 5189 | ||
5185 | evas_object_textblock_text_markup_prepend(o->cursor, text); | 5190 | evas_object_textblock_text_markup_prepend(o->cursor, text); |
5186 | /* Point all the cursors to the starrt */ | 5191 | /* Point all the cursors to the starrt */ |
@@ -9530,7 +9535,7 @@ evas_object_textblock_init(Evas_Object *eo_obj) | |||
9530 | obj->type = o_type; | 9535 | obj->type = o_type; |
9531 | 9536 | ||
9532 | o->cursor->obj = eo_obj; | 9537 | o->cursor->obj = eo_obj; |
9533 | o->cursor->node = o->text_nodes = _evas_textblock_node_text_new(); | 9538 | evas_object_textblock_text_markup_set(eo_obj, ""); |
9534 | 9539 | ||
9535 | o->legacy_newline = EINA_TRUE; | 9540 | o->legacy_newline = EINA_TRUE; |
9536 | evas_object_event_callback_priority_add(eo_obj, EVAS_CALLBACK_RESIZE, -1000, | 9541 | evas_object_event_callback_priority_add(eo_obj, EVAS_CALLBACK_RESIZE, -1000, |