summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-05-23 16:04:53 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-05-28 15:34:26 +0300
commit0d836045993c7ef347e9e9bdd400e4617031b4c9 (patch)
tree1bf77f5063dac5a335b926aa3e38f113f0060a98
parente55b91aa910cd79ba08579b2e64ea2820d70c12b (diff)
Ui text: use new text api instead of 'style'
-rw-r--r--src/bin/elementary/test_efl_ui_text.c5
-rw-r--r--src/lib/elementary/efl_ui_text.c1
2 files changed, 5 insertions, 1 deletions
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
172 " new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis" 172 " new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis"
173 " is the next line.\nThis is Yet another line! Line and paragraph" 173 " is the next line.\nThis is Yet another line! Line and paragraph"
174 " separators are actually different!"); 174 " separators are actually different!");
175 efl_text_font_set(en, "Sans", 14);
176 efl_text_font_weight_set(en, EFL_TEXT_FONT_WEIGHT_BOLD);
177 efl_text_font_slant_set(en, EFL_TEXT_FONT_SLANT_ITALIC);
178 efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
179 efl_text_style_normal_color_set(en, 255, 255, 255, 255);
175 180
176 main_cur = efl_canvas_text_cursor_get(en); 181 main_cur = efl_canvas_text_cursor_get(en);
177 cur = efl_ui_text_cursor_new(en); 182 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)
3266 (priv->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 3266 (priv->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
3267 evas_object_size_hint_align_set 3267 evas_object_size_hint_align_set
3268 (priv->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL); 3268 (priv->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
3269 efl_canvas_text_style_set(text_obj, NULL, "DEFAULT='font=Sans font_size=14 color=#fff wrap=word'");
3270 efl_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, 3269 efl_event_callback_add(text_obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
3271 _efl_ui_text_changed_cb, obj); 3270 _efl_ui_text_changed_cb, obj);
3272 efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, 3271 efl_event_callback_add(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,