herdsman pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0d836045993c7ef347e9e9bdd400e4617031b4c9
commit 0d836045993c7ef347e9e9bdd400e4617031b4c9
Author: Daniel Hirt <hirt.da...@gmail.com>
Date: Tue May 23 16:04:53 2017 +0300
Ui text: use new text api instead of 'style'
---
src/bin/elementary/test_efl_ui_text.c | 5 +++++
src/lib/elementary/efl_ui_text.c | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bin/elementary/test_efl_ui_text.c
b/src/bin/elementary/test_efl_ui_text.c
index 15c4a2b077..49ad15d46d 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -172,6 +172,11 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
" new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis"
" is the next line.\nThis is Yet another line! Line and paragraph"
" separators are actually different!");
+ efl_text_font_set(en, "Sans", 14);
+ efl_text_font_weight_set(en, EFL_TEXT_FONT_WEIGHT_BOLD);
+ efl_text_font_slant_set(en, EFL_TEXT_FONT_SLANT_ITALIC);
+ efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
+ efl_text_style_normal_color_set(en, 255, 255, 255, 255);
main_cur = efl_canvas_text_cursor_get(en);
cur = efl_ui_text_cursor_new(en);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 4c2274ef20..fbb882fae0 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3266,7 +3266,6 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj,
Efl_Ui_Text_Data *priv)
(priv->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set
(priv->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
- efl_canvas_text_style_set(text_obj, NULL, "DEFAULT='font=Sans font_size=14
color=#fff wrap=word'");
efl_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
_efl_ui_text_changed_cb, obj);
efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
--
