summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-12-26 18:01:32 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-12-26 18:01:32 +0900
commit3bd4f04ec7392c7e4b745082303ac28fbfc2b2d6 (patch)
tree9d3cbee76d2661409678748fbe2c8439ce3db97f
parent43bd6ab7ea86f4947ee7306c346e716329b93422 (diff)
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
-rw-r--r--src/lib/efl/interfaces/efl_text_format.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo12
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c12
-rw-r--r--src/tests/evas/evas_test_textblock.c2
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 {
77 } 77 }
78 } 78 }
79 79
80 @property linegap { 80 @property line_gap {
81 [[Minimal line gap (top and bottom) for each line in the text. 81 [[Minimal line gap (top and bottom) for each line in the text.
82 82
83 $value is absolute size. 83 $value is absolute size.
@@ -88,7 +88,7 @@ interface @beta Efl.Text_Format {
88 } 88 }
89 } 89 }
90 90
91 @property linerelgap { 91 @property line_rel_gap {
92 [[Relative line gap (top and bottom) for each line in the text. 92 [[Relative line gap (top and bottom) for each line in the text.
93 93
94 The original line gap value is multiplied by $value. 94 The original line gap value is multiplied by $value.
@@ -99,7 +99,7 @@ interface @beta Efl.Text_Format {
99 } 99 }
100 } 100 }
101 101
102 @property tabstops { 102 @property tab_stops {
103 [[Size of the tab character.]] 103 [[Size of the tab character.]]
104 values 104 values
105 { 105 {
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,
259 259
260 - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one. 260 - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one.
261 Default value is $[32]. 261 Default value is $[32].
262 See @Efl.Text_Format.tabstops. 262 See @Efl.Text_Format.tab_stops.
263 263
264 - $linesize: Distance (in pixels) from the baseline of one line of text to the next. This is, a value of 264 - $linesize: Distance (in pixels) from the baseline of one line of text to the next. This is, a value of
265 $[0] would render all lines on top of each other (However, this value will be ignored if it results in 265 $[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,
276 - $linegap: Additional empty space (in pixels) between the bottom of one line of text and the top of the 276 - $linegap: Additional empty space (in pixels) between the bottom of one line of text and the top of the
277 next. Setting this value sets $linerelgap to $[0%] (disables it). 277 next. Setting this value sets $linerelgap to $[0%] (disables it).
278 Default value is $[0]. 278 Default value is $[0].
279 See @Efl.Text_Format.linegap. 279 See @Efl.Text_Format.line_gap.
280 280
281 - $linerelgap: Additional empty space (in percentage over the natural line height) between the bottom of 281 - $linerelgap: Additional empty space (in percentage over the natural line height) between the bottom of
282 one line of text and the top of the next. 282 one line of text and the top of the next.
283 Setting this value sets $linegap to $[0] (disables it). 283 Setting this value sets $linegap to $[0] (disables it).
284 Default value is $[0%]. 284 Default value is $[0%].
285 See @Efl.Text_Format.linerelgap. 285 See @Efl.Text_Format.line_rel_gap.
286 286
287 - $linefill: An alternate way to specify the $linesize as a percentage of the canvas height. 287 - $linefill: An alternate way to specify the $linesize as a percentage of the canvas height.
288 A value of $[100%] means that a single line fills the canvas, whereas $[25%] means that 4 lines 288 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,
489 Efl.Text_Format.text_horizontal_align { get; set; } 489 Efl.Text_Format.text_horizontal_align { get; set; }
490 Efl.Text_Format.text_horizontal_align_auto_type { get; set; } 490 Efl.Text_Format.text_horizontal_align_auto_type { get; set; }
491 Efl.Text_Format.text_vertical_align { get; set; } 491 Efl.Text_Format.text_vertical_align { get; set; }
492 Efl.Text_Format.linegap { get; set; } 492 Efl.Text_Format.line_gap { get; set; }
493 Efl.Text_Format.linerelgap { get; set; } 493 Efl.Text_Format.line_rel_gap { get; set; }
494 Efl.Text_Format.tabstops { get; set; } 494 Efl.Text_Format.tab_stops { get; set; }
495 Efl.Text_Format.password { get; set; } 495 Efl.Text_Format.password { get; set; }
496 Efl.Text_Format.replacement_char { get; set; } 496 Efl.Text_Format.replacement_char { get; set; }
497 Efl.Text_Markup.markup { set; get; } 497 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
16833} 16833}
16834 16834
16835static void 16835static void
16836_efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) 16836_efl_canvas_textblock_efl_text_format_line_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED)
16837{ 16837{
16838 ASYNC_BLOCK; 16838 ASYNC_BLOCK;
16839 double linerelgap = _FMT(linerelgap); 16839 double linerelgap = _FMT(linerelgap);
@@ -16852,13 +16852,13 @@ _efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canva
16852} 16852}
16853 16853
16854static double 16854static double
16855_efl_canvas_textblock_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16855_efl_canvas_textblock_efl_text_format_line_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16856{ 16856{
16857 return _FMT(linegap); 16857 return _FMT(linegap);
16858} 16858}
16859 16859
16860static void 16860static void
16861_efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) 16861_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)
16862{ 16862{
16863 ASYNC_BLOCK; 16863 ASYNC_BLOCK;
16864 double linegap = _FMT(linegap); 16864 double linegap = _FMT(linegap);
@@ -16876,20 +16876,20 @@ _efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Ca
16876} 16876}
16877 16877
16878static double 16878static double
16879_efl_canvas_textblock_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16879_efl_canvas_textblock_efl_text_format_line_rel_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16880{ 16880{
16881 return _FMT(linerelgap); 16881 return _FMT(linerelgap);
16882} 16882}
16883 16883
16884static void 16884static void
16885_efl_canvas_textblock_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED) 16885_efl_canvas_textblock_efl_text_format_tab_stops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED)
16886{ 16886{
16887 ASYNC_BLOCK; 16887 ASYNC_BLOCK;
16888 _FMT_SET(tabstops, value); 16888 _FMT_SET(tabstops, value);
16889} 16889}
16890 16890
16891static int 16891static int
16892_efl_canvas_textblock_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16892_efl_canvas_textblock_efl_text_format_tab_stops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16893{ 16893{
16894 return _FMT(tabstops); 16894 return _FMT(tabstops);
16895} 16895}
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)
4877 efl_text_underline_type_set(txt, EFL_TEXT_STYLE_UNDERLINE_TYPE_DOUBLE); 4877 efl_text_underline_type_set(txt, EFL_TEXT_STYLE_UNDERLINE_TYPE_DOUBLE);
4878 efl_text_font_weight_set(txt, EFL_TEXT_FONT_WEIGHT_EXTRABOLD); 4878 efl_text_font_weight_set(txt, EFL_TEXT_FONT_WEIGHT_EXTRABOLD);
4879 efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE); 4879 efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE);
4880 efl_text_tabstops_set(txt, 20); 4880 efl_text_tab_stops_set(txt, 20);
4881 4881
4882 efl_canvas_textblock_style_apply(txt, "color=#90E135"); 4882 efl_canvas_textblock_style_apply(txt, "color=#90E135");
4883 4883