woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3bd4f04ec7392c7e4b745082303ac28fbfc2b2d6
commit 3bd4f04ec7392c7e4b745082303ac28fbfc2b2d6 Author: Ali Alzyod <[email protected]> Date: Thu Dec 26 18:01:32 2019 +0900 efl_text_format: rename tabstops,lingap,linerelgap Summary: rename tabstops,lingap,linerelgap to have underscore between words Reviewers: segfaultxavi, woohyun Reviewed By: woohyun Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7856 Differential Revision: https://phab.enlightenment.org/D10963 --- src/lib/efl/interfaces/efl_text_format.eo | 6 +++--- src/lib/evas/canvas/efl_canvas_textblock.eo | 12 ++++++------ src/lib/evas/canvas/evas_object_textblock.c | 12 ++++++------ src/tests/evas/evas_test_textblock.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo index 79e62883da..5c974a675e 100644 --- a/src/lib/efl/interfaces/efl_text_format.eo +++ b/src/lib/efl/interfaces/efl_text_format.eo @@ -77,7 +77,7 @@ interface @beta Efl.Text_Format { } } - @property linegap { + @property line_gap { [[Minimal line gap (top and bottom) for each line in the text. $value is absolute size. @@ -88,7 +88,7 @@ interface @beta Efl.Text_Format { } } - @property linerelgap { + @property line_rel_gap { [[Relative line gap (top and bottom) for each line in the text. The original line gap value is multiplied by $value. @@ -99,7 +99,7 @@ interface @beta Efl.Text_Format { } } - @property tabstops { + @property tab_stops { [[Size of the tab character.]] values { diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo index 442c418fcd..7ea9609836 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock.eo +++ b/src/lib/evas/canvas/efl_canvas_textblock.eo @@ -259,7 +259,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one. Default value is $[32]. - See @Efl.Text_Format.tabstops. + See @Efl.Text_Format.tab_stops. - $linesize: Distance (in pixels) from the baseline of one line of text to the next. This is, a value of $[0] would render all lines on top of each other (However, this value will be ignored if it results in @@ -276,13 +276,13 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, - $linegap: Additional empty space (in pixels) between the bottom of one line of text and the top of the next. Setting this value sets $linerelgap to $[0%] (disables it). Default value is $[0]. - See @Efl.Text_Format.linegap. + See @Efl.Text_Format.line_gap. - $linerelgap: Additional empty space (in percentage over the natural line height) between the bottom of one line of text and the top of the next. Setting this value sets $linegap to $[0] (disables it). Default value is $[0%]. - See @Efl.Text_Format.linerelgap. + See @Efl.Text_Format.line_rel_gap. - $linefill: An alternate way to specify the $linesize as a percentage of the canvas height. A value of $[100%] means that a single line fills the canvas, whereas $[25%] means that 4 lines @@ -489,9 +489,9 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, Efl.Text_Format.text_horizontal_align { get; set; } Efl.Text_Format.text_horizontal_align_auto_type { get; set; } Efl.Text_Format.text_vertical_align { get; set; } - Efl.Text_Format.linegap { get; set; } - Efl.Text_Format.linerelgap { get; set; } - Efl.Text_Format.tabstops { get; set; } + Efl.Text_Format.line_gap { get; set; } + Efl.Text_Format.line_rel_gap { get; set; } + Efl.Text_Format.tab_stops { get; set; } Efl.Text_Format.password { get; set; } Efl.Text_Format.replacement_char { get; set; } Efl.Text_Markup.markup { set; get; } diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index bdbe9b18c8..03d4a4bdc7 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -16833,7 +16833,7 @@ _efl_canvas_textblock_efl_text_format_text_vertical_align_get(const Eo *obj EINA } static void -_efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_line_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) { ASYNC_BLOCK; double linerelgap = _FMT(linerelgap); @@ -16852,13 +16852,13 @@ _efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canva } static double -_efl_canvas_textblock_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_line_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(linegap); } static void -_efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_line_rel_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) { ASYNC_BLOCK; double linegap = _FMT(linegap); @@ -16876,20 +16876,20 @@ _efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Ca } static double -_efl_canvas_textblock_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_line_rel_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(linerelgap); } static void -_efl_canvas_textblock_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_tab_stops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(tabstops, value); } static int -_efl_canvas_textblock_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_tab_stops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(tabstops); } diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 64dc47996b..9e9c43f259 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -4877,7 +4877,7 @@ EFL_START_TEST(efl_canvas_textblock_style) efl_text_underline_type_set(txt, EFL_TEXT_STYLE_UNDERLINE_TYPE_DOUBLE); efl_text_font_weight_set(txt, EFL_TEXT_FONT_WEIGHT_EXTRABOLD); efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE); - efl_text_tabstops_set(txt, 20); + efl_text_tab_stops_set(txt, 20); efl_canvas_textblock_style_apply(txt, "color=#90E135"); --
