diff options
| author | Ali Alzyod <ali198724@gmail.com> | 2019-12-16 19:10:36 +0100 |
|---|---|---|
| committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-12-16 19:11:33 +0100 |
| commit | 68e9bf9c14b58c682d5151f73b21f920905bd320 (patch) | |
| tree | 351f1d0023bf69840d9adf3de002d70f4c622d4b | |
| parent | 16efc25ceb3a7fbf4605fb808748dcdbc004e6fb (diff) | |
| download | efl-68e9bf9c14b58c682d5151f73b21f920905bd320.tar.gz | |
efl_canvas_textblock: allow style_apply with wrap=none
Summary:
1- passing style_apply("wrap=none") had no effect previously, and now disable wraping
2- style_all_get() by default return "wrap=word", but now return "wrap=none"
refer to T8523
Reviewers: segfaultxavi, woohyun, cedric
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10888
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_textblock.eo | 2 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 7 | ||||
| -rw-r--r-- | src/tests/evas/evas_test_textblock.c | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo index 2c00967374..7c6cf8e0e6 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock.eo +++ b/src/lib/evas/canvas/efl_canvas_textblock.eo @@ -274,7 +274,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, "char" - Wraps at any character "mixed" - Wrap at words if possible, if not at any character "hyphenation" - Hyphenate if possible, if not wrap at words if possible, if not at any character - "" - Don't wrap + "none" - Don't wrap, this is the default value wrap=<value or preset> Left margin diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index e68f70351a..63f725f00c 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -2921,6 +2921,8 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, wrap = EFL_TEXT_FORMAT_WRAP_MIXED; else if (!strcmp("hyphenation", param)) wrap = EFL_TEXT_FORMAT_WRAP_HYPHENATION; + else if (!strcmp("none", param)) + wrap = EFL_TEXT_FORMAT_WRAP_NONE; if (_FMT_INFO(wrap) != wrap) { @@ -3304,9 +3306,12 @@ _format_string_get(const Eo *eo_obj, Evas_Object_Textblock_Format *fmt) case EFL_TEXT_FORMAT_WRAP_HYPHENATION: wrap_value_str = "hyphenation"; break; - default: + case EFL_TEXT_FORMAT_WRAP_WORD: wrap_value_str = "word"; break; + default: + wrap_value_str = "none"; + break; } PRINTF_APPEND_STR(wrapstr, wrap_value_str); diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 16fd38f437..94849a57e1 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -4628,6 +4628,7 @@ EFL_START_TEST(efl_canvas_textblock_style) fail_if(!strstr(style, "font=DejaVuSans,UnDotum,malayalam")); // default value fail_if(!strstr(style, "font_width=normal")); + fail_if(!strstr(style, "wrap=none")); // from functions fail_if(!strstr(style, "font_weight=extrabold")); @@ -4641,6 +4642,9 @@ EFL_START_TEST(efl_canvas_textblock_style) efl_canvas_textblock_style_apply(txt, "font_width=ultracondensed"); ck_assert_int_eq(efl_text_font_width_get(txt), EFL_TEXT_FONT_WIDTH_ULTRACONDENSED); + efl_canvas_textblock_style_apply(txt, "wrap=word"); + ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_WORD); + efl_canvas_textblock_style_apply(txt, "wrap=none"); ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_NONE); |