kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ali Alzyod 2019-12-26 18:01:32 +09:00 committed by WooHyun Jung
parent 43bd6ab7ea
commit 3bd4f04ec7
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/efl/interfaces/efl_text_format.eo
View File

@ -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. [[Minimal line gap (top and bottom) for each line in the text.
$value is absolute size. $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. [[Relative line gap (top and bottom) for each line in the text.
The original line gap value is multiplied by $value. 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.]] [[Size of the tab character.]]
values values
{ {

12
src/lib/evas/canvas/efl_canvas_textblock.eo
View File

@ -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. - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one.
Default value is $[32]. 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 - $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 $[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 - $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). next. Setting this value sets $linerelgap to $[0%] (disables it).
Default value is $[0]. 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 - $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. one line of text and the top of the next.
Setting this value sets $linegap to $[0] (disables it). Setting this value sets $linegap to $[0] (disables it).
Default value is $[0%]. 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. - $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 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 { get; set; }
Efl.Text_Format.text_horizontal_align_auto_type { get; set; } Efl.Text_Format.text_horizontal_align_auto_type { get; set; }
Efl.Text_Format.text_vertical_align { get; set; } Efl.Text_Format.text_vertical_align { get; set; }
Efl.Text_Format.linegap { get; set; } Efl.Text_Format.line_gap { get; set; }
Efl.Text_Format.linerelgap { get; set; } Efl.Text_Format.line_rel_gap { get; set; }
Efl.Text_Format.tabstops { get; set; } Efl.Text_Format.tab_stops { get; set; }
Efl.Text_Format.password { get; set; } Efl.Text_Format.password { get; set; }
Efl.Text_Format.replacement_char { get; set; } Efl.Text_Format.replacement_char { get; set; }
Efl.Text_Markup.markup { set; get; } Efl.Text_Markup.markup { set; get; }

12
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -16833,7 +16833,7 @@ _efl_canvas_textblock_efl_text_format_text_vertical_align_get(const Eo *obj EINA
} }
static void 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; ASYNC_BLOCK;
double linerelgap = _FMT(linerelgap); double linerelgap = _FMT(linerelgap);
@ -16852,13 +16852,13 @@ _efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canva
} }
static double 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); return _FMT(linegap);
} }
static void 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; ASYNC_BLOCK;
double linegap = _FMT(linegap); double linegap = _FMT(linegap);
@ -16876,20 +16876,20 @@ _efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Ca
} }
static double 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); return _FMT(linerelgap);
} }
static void 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; ASYNC_BLOCK;
_FMT_SET(tabstops, value); _FMT_SET(tabstops, value);
} }
static int 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); return _FMT(tabstops);
} }

2
src/tests/evas/evas_test_textblock.c
View File

@ -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_underline_type_set(txt, EFL_TEXT_STYLE_UNDERLINE_TYPE_DOUBLE);
efl_text_font_weight_set(txt, EFL_TEXT_FONT_WEIGHT_EXTRABOLD); efl_text_font_weight_set(txt, EFL_TEXT_FONT_WEIGHT_EXTRABOLD);
efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE); 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"); efl_canvas_textblock_style_apply(txt, "color=#90E135");