diff options
| author | Daniel Hirt <hirt.danny@gmail.com> | 2017-05-23 16:04:53 +0300 |
|---|---|---|
| committer | Daniel Hirt <hirt.danny@gmail.com> | 2017-05-25 14:26:59 +0300 |
| commit | f2a45c62064d5bb1fbb8d54848c96e6cdc342b4f (patch) | |
| tree | 9da6b38ab195876c7c461b9574ce6044a0649382 | |
| parent | 2ef8b8d698a82d1e3628f7015c52500d5ec7cf60 (diff) | |
| download | efl-f2a45c62064d5bb1fbb8d54848c96e6cdc342b4f.tar.gz | |
Ui text: use new text api instead of 'style'
| -rw-r--r-- | src/bin/elementary/test_efl_ui_text.c | 5 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_text.c | 9 |
2 files changed, 6 insertions, 8 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 " 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 810b4cb921..fbb882fae0 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -651,10 +651,6 @@ _efl_ui_text_theme_group_get(Evas_Object *obj) { EFL_UI_TEXT_DATA_GET(obj, sd); - Eina_Bool single_line; - - single_line = !efl_text_multiline_get(obj); - if (sd->editable) { if (sd->password) return "base-password"; @@ -2079,7 +2075,7 @@ _entry_changed_handle(void *data, Evas_Coord minh; const char *text; Eina_Bool single_line; - + Eo *obj = data; EFL_UI_TEXT_DATA_GET(data, sd); @@ -3006,8 +3002,6 @@ _efl_ui_text_resize_internal(Evas_Object *obj) elm_interface_scrollable_content_viewport_geometry_get (obj, NULL, NULL, &vw, &vh); - if (vw < sd->ent_mw) vw = sd->ent_mw; - if (vh < sd->ent_mh) vh = sd->ent_mh; evas_object_resize(sd->entry_edje, vw, vh); } @@ -3272,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, |