enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas: Add type convert function for BIDI_Direction_Type. 

Summary:
   evas_object_paragraph_direction_set/get function shoud keep parameter type Evas_BiDi_Direction.
   So, I add convert function.

Test Plan: N/A

Reviewers: zmike, Jaehyun_Cho, herb

Reviewed By: Jaehyun_Cho

Subscribers: cedric, #reviewers, Hermet, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8399
This commit is contained in:
junsu choi 2019-03-19 12:27:48 +09:00 committed by Jaehyun Cho
parent 05c9aff90a
commit ee6e9ff9ad
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/lib/evas/canvas/efl_canvas_object_eo.legacy.c
View File

@ -101,14 +101,46 @@ evas_object_smart_parent_get(const Efl_Canvas_Object *obj)
return efl_canvas_object_render_parent_get(obj);
}
EAPI void
evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Efl_Text_Bidirectional_Type dir)
static inline Efl_Text_Bidirectional_Type
_evas_bidi_direction_type_to_efl_text_bidirectional_type(Evas_BiDi_Direction type)
{
efl_canvas_object_paragraph_direction_set(obj, dir);
switch (type)
{
#define CONVERT_TYPE(TYPE) case EVAS_BIDI_DIRECTION_##TYPE: return EFL_TEXT_BIDIRECTIONAL_TYPE_##TYPE
CONVERT_TYPE(NATURAL); //Neutral text type, same as natural
CONVERT_TYPE(LTR);
CONVERT_TYPE(RTL);
CONVERT_TYPE(INHERIT);
default: break;
}
return EFL_TEXT_BIDIRECTIONAL_TYPE_NATURAL;
#undef CONVERT_TYPE
}
EAPI Efl_Text_Bidirectional_Type
static inline Evas_BiDi_Direction
_efl_text_bidirectional_type_to_evas_bidi_direction_type(Efl_Text_Bidirectional_Type type)
{
switch (type)
{
#define CONVERT_TYPE(TYPE) case EFL_TEXT_BIDIRECTIONAL_TYPE_##TYPE: return EVAS_BIDI_DIRECTION_##TYPE
CONVERT_TYPE(NATURAL); //Neutral text type, same as natural
CONVERT_TYPE(LTR);
CONVERT_TYPE(RTL);
CONVERT_TYPE(INHERIT);
default: break;
}
return EVAS_BIDI_DIRECTION_NATURAL;
#undef CONVERT_TYPE
}
EAPI void
evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_Direction dir)
{
efl_canvas_object_paragraph_direction_set(obj, _evas_bidi_direction_type_to_efl_text_bidirectional_type(dir));
}
EAPI Evas_BiDi_Direction
evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj)
{
return efl_canvas_object_paragraph_direction_get(obj);
return _efl_text_bidirectional_type_to_evas_bidi_direction_type(efl_canvas_object_paragraph_direction_get(obj));
}

4
src/lib/evas/canvas/efl_canvas_object_eo.legacy.h
View File

@ -373,7 +373,7 @@ EAPI Efl_Canvas_Object *evas_object_smart_parent_get(const Efl_Canvas_Object *ob
*
* @ingroup Evas_Object_Group
*/
EAPI void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Efl_Text_Bidirectional_Type dir);
EAPI void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_Direction dir);
/**
* @brief This handles text paragraph direction of the given object. Even if
@ -387,7 +387,7 @@ EAPI void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Efl_Text_B
*
* @ingroup Evas_Object_Group
*/
EAPI Efl_Text_Bidirectional_Type evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj);
EAPI Evas_BiDi_Direction evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj);
/**
* @brief Test if any object is clipped by @c obj.