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

Efl text style: remove 'underline2_type' property 

This moves the logic to the 'underline_type' property, in which we
define the type.
This commit is contained in:
Daniel Hirt 2018-11-06 16:53:03 +02:00
parent e1fc2ea48f
commit 6285cfe366
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/efl/interfaces/efl_text_style.eo
View File

@ -153,15 +153,6 @@ interface Efl.Text_Style {
}
}
@property underline2_type
{
[[Type of underline2 style]]
values
{
type: Efl.Text_Style_Underline_Type; [[Underline type]]
}
}
@property underline2_color
{
[[Color of underline2 style]]

1
src/lib/evas/canvas/efl_canvas_text.eo
View File

@ -294,7 +294,6 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text_Style.underline_dashed_color { get; set; }
Efl.Text_Style.underline_dashed_width { get; set; }
Efl.Text_Style.underline_dashed_gap { get; set; }
Efl.Text_Style.underline2_type { get; set; }
Efl.Text_Style.underline2_color { get; set; }
Efl.Text_Style.strikethrough_type { get; set; }
Efl.Text_Style.strikethrough_color { get; set; }

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

@ -15800,11 +15800,26 @@ _efl_canvas_text_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Efl
_FMT_COLOR_RET(backing);
}
static struct
{
Eina_Bool underline_single : 1;
Eina_Bool underline_double : 1;
Eina_Bool underline_dashed : 1;
} _style_underline_map[] = {
{ 0, 0, 0 },
{ 1, 0, 0 },
{ 1, 1, 0 },
{ 0, 0, 1 }
};
static void
_efl_canvas_text_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED)
{
ASYNC_BLOCK;
_FMT_SET(underline, type);
_FMT_SET(underline, _style_underline_map[type].underline_single);
_FMT_SET(underline2, _style_underline_map[type].underline_double);
_FMT_SET(underline_dash, _style_underline_map[type].underline_dashed);
}
static Efl_Text_Style_Underline_Type
@ -15878,19 +15893,6 @@ _efl_canvas_text_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUS
return _FMT(underline_dash_width);
}
static void
_efl_canvas_text_efl_text_style_underline2_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED)
{
ASYNC_BLOCK;
_FMT_SET(underline2, type);
}
static Efl_Text_Style_Underline_Type
_efl_canvas_text_efl_text_style_underline2_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(underline2);
}
static void
_efl_canvas_text_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
{