summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 17:42:43 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:06:24 -0800
commit91b84fa2a8d2178fa1ef943da97a1c4bb45a2a4b (patch)
tree4839ee256007e2e42ad358a78fd3fb6b7027a4fc
parent12e78b50593a60e97dffb5048eac182b24ed802e (diff)
evas: restore legacy types which were defined to eo types
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8245
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/edje/edje_text.c2
-rw-r--r--src/lib/evas/Evas_Common.h119
-rw-r--r--src/lib/evas/canvas/evas_device.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c12
-rw-r--r--src/lib/evas/canvas/evas_object_text.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c12
-rw-r--r--src/tests/evas/evas_test_object_smart.c10
-rw-r--r--src/tests/evas/evas_test_text.c16
10 files changed, 116 insertions, 87 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 0d0baf334a..7b97bd303e 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -454,7 +454,7 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
454} 454}
455 455
456EOLIAN static void 456EOLIAN static void
457_efl_canvas_layout_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) 457_efl_canvas_layout_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Efl_Text_Bidirectional_Type dir)
458{ 458{
459 efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir); 459 efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir);
460 460
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index f3be77313c..95d7676989 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -499,7 +499,7 @@ arrange_text:
499 FLOAT_T align_x; 499 FLOAT_T align_x;
500 if (params->type.text->align.x < FROM_INT(0)) 500 if (params->type.text->align.x < FROM_INT(0))
501 { 501 {
502 if (evas_object_text_direction_get(ep->object) == 502 if ((Evas_BiDi_Direction)evas_object_text_direction_get(ep->object) ==
503 EVAS_BIDI_DIRECTION_RTL) 503 EVAS_BIDI_DIRECTION_RTL)
504 { 504 {
505 align_x = FROM_INT(1); 505 align_x = FROM_INT(1);
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 9e8e1e21ab..2df4faeed8 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -246,10 +246,12 @@ typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source
246/* Opaque types */ 246/* Opaque types */
247typedef Eo Evas_Device; /**< A source device handle - where the event came from */ 247typedef Eo Evas_Device; /**< A source device handle - where the event came from */
248 248
249typedef Efl_Gfx_Image_Content_Hint Evas_Image_Content_Hint; 249typedef enum _Evas_Image_Content_Hint
250#define EVAS_IMAGE_CONTENT_HINT_NONE EFL_GFX_IMAGE_CONTENT_HINT_NONE 250{
251#define EVAS_IMAGE_CONTENT_HINT_DYNAMIC EFL_GFX_IMAGE_CONTENT_HINT_DYNAMIC 251 EVAS_IMAGE_CONTENT_HINT_NONE = 0, /**< No hint at all */
252#define EVAS_IMAGE_CONTENT_HINT_STATIC EFL_GFX_IMAGE_CONTENT_HINT_STATIC 252 EVAS_IMAGE_CONTENT_HINT_DYNAMIC = 1, /**< The contents will change over time */
253 EVAS_IMAGE_CONTENT_HINT_STATIC = 2 /**< The contents won't change over time */
254} Evas_Image_Content_Hint; /**< How an image's data is to be treated by Evas, for optimization */
253 255
254typedef enum _Evas_Alloc_Error 256typedef enum _Evas_Alloc_Error
255{ 257{
@@ -295,17 +297,18 @@ typedef enum _Evas_Engine_Render_Mode
295 297
296typedef Efl_Gfx_Event_Render_Post Evas_Event_Render_Post; /**< Event info sent after a frame was rendered. @since 1.18 */ 298typedef Efl_Gfx_Event_Render_Post Evas_Event_Render_Post; /**< Event info sent after a frame was rendered. @since 1.18 */
297 299
298typedef Efl_Input_Device_Type Evas_Device_Class; 300typedef enum _Evas_Device_Class
299 301{
300#define EVAS_DEVICE_CLASS_NONE EFL_INPUT_DEVICE_TYPE_NONE /**< Not a device @since 1.8 */ 302 EVAS_DEVICE_CLASS_NONE, /**< Not a device @since 1.8 */
301#define EVAS_DEVICE_CLASS_SEAT EFL_INPUT_DEVICE_TYPE_SEAT /**< The user/seat (the user themselves) @since 1.8 */ 303 EVAS_DEVICE_CLASS_SEAT, /**< The user/seat (the user themselves) @since 1.8 */
302#define EVAS_DEVICE_CLASS_KEYBOARD EFL_INPUT_DEVICE_TYPE_KEYBOARD /**< A regular keyboard, numberpad or attached buttons @since 1.8 */ 304 EVAS_DEVICE_CLASS_KEYBOARD, /**< A regular keyboard, numberpad or attached buttons @since 1.8 */
303#define EVAS_DEVICE_CLASS_MOUSE EFL_INPUT_DEVICE_TYPE_MOUSE /**< A mouse, trackball or touchpad relative motion device @since 1.8 */ 305 EVAS_DEVICE_CLASS_MOUSE, /**< A mouse, trackball or touchpad relative motion device @since 1.8 */
304#define EVAS_DEVICE_CLASS_TOUCH EFL_INPUT_DEVICE_TYPE_TOUCH /**< A touchscreen with fingers or stylus @since 1.8 */ 306 EVAS_DEVICE_CLASS_TOUCH, /**< A touchscreen with fingers or stylus @since 1.8 */
305#define EVAS_DEVICE_CLASS_PEN EFL_INPUT_DEVICE_TYPE_PEN /**< A special pen device @since 1.8 */ 307 EVAS_DEVICE_CLASS_PEN, /**< A special pen device @since 1.8 */
306#define EVAS_DEVICE_CLASS_POINTER EFL_INPUT_DEVICE_TYPE_WAND /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */ 308#define EVAS_DEVICE_CLASS_WAND EVAS_DEVICE_CLASS_POINTER
307#define EVAS_DEVICE_CLASS_WAND EFL_INPUT_DEVICE_TYPE_WAND /**< A synonym for EVAS_DEVICE_CLASS_POINTER @since 1.18 */ 309 EVAS_DEVICE_CLASS_POINTER, /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */
308#define EVAS_DEVICE_CLASS_GAMEPAD EFL_INPUT_DEVICE_TYPE_GAMEPAD /**< A gamepad controller or joystick @since 1.8 */ 310 EVAS_DEVICE_CLASS_GAMEPAD /**< A gamepad controller or joystick @since 1.8 */
311} Evas_Device_Class; /**< A general class of device @since 1.8 */
309 312
310/** 313/**
311 * @brief Specific type of input device. 314 * @brief Specific type of input device.
@@ -329,39 +332,65 @@ typedef enum
329 EVAS_DEVICE_SUBCLASS_TRACKBALL /**< A trackball style mouse. */ 332 EVAS_DEVICE_SUBCLASS_TRACKBALL /**< A trackball style mouse. */
330} Evas_Device_Subclass; 333} Evas_Device_Subclass;
331 334
332typedef Efl_Pointer_Flags Evas_Button_Flags; 335/**
333 336 * Flags for Mouse Button events
334#define EVAS_BUTTON_NONE EFL_POINTER_FLAGS_NONE 337 */
335#define EVAS_BUTTON_DOUBLE_CLICK EFL_POINTER_FLAGS_DOUBLE_CLICK 338typedef enum _Evas_Button_Flags
336#define EVAS_BUTTON_TRIPLE_CLICK EFL_POINTER_FLAGS_TRIPLE_CLICK 339{
337 340 EVAS_BUTTON_NONE = 0, /**< No extra mouse button data */
338typedef Efl_Input_Flags Evas_Event_Flags; 341 EVAS_BUTTON_DOUBLE_CLICK = (1 << 0), /**< This mouse button press was the 2nd press of a double click */
339 342 EVAS_BUTTON_TRIPLE_CLICK = (1 << 1) /**< This mouse button press was the 3rd press of a triple click */
340#define EVAS_EVENT_FLAG_NONE EFL_INPUT_FLAGS_NONE 343} Evas_Button_Flags; /**< Flags for Mouse Button events */
341#define EVAS_EVENT_FLAG_ON_HOLD EFL_INPUT_FLAGS_PROCESSED
342#define EVAS_EVENT_FLAG_ON_SCROLL EFL_INPUT_FLAGS_SCROLLING
343
344typedef Efl_Gfx_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */
345
346#define EVAS_ASPECT_CONTROL_NONE EFL_GFX_HINT_ASPECT_NONE
347#define EVAS_ASPECT_CONTROL_NEITHER EFL_GFX_HINT_ASPECT_NEITHER
348#define EVAS_ASPECT_CONTROL_HORIZONTAL EFL_GFX_HINT_ASPECT_HORIZONTAL
349#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_HINT_ASPECT_VERTICAL
350#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_HINT_ASPECT_BOTH
351
352typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction;
353 344
354#define EVAS_BIDI_DIRECTION_NATURAL EFL_TEXT_BIDIRECTIONAL_TYPE_NATURAL 345/**
355#define EVAS_BIDI_DIRECTION_NEUTRAL EFL_TEXT_BIDIRECTIONAL_TYPE_NEUTRAL 346 * Flags for Events
356#define EVAS_BIDI_DIRECTION_LTR EFL_TEXT_BIDIRECTIONAL_TYPE_LTR 347 */
357#define EVAS_BIDI_DIRECTION_RTL EFL_TEXT_BIDIRECTIONAL_TYPE_RTL 348typedef enum _Evas_Event_Flags
358#define EVAS_BIDI_DIRECTION_INHERIT EFL_TEXT_BIDIRECTIONAL_TYPE_INHERIT 349{
350 EVAS_EVENT_FLAG_NONE = 0, /**< No fancy flags set */
351 EVAS_EVENT_FLAG_ON_HOLD = (1 << 0), /**< This event is being delivered but should be put "on hold" until the on hold flag is unset. The event should be used for informational purposes and maybe some indications visually, but not actually perform anything */
352 EVAS_EVENT_FLAG_ON_SCROLL = (1 << 1) /**< This event flag indicates the event occurs while scrolling; for example, DOWN event occurs during scrolling; the event should be used for informational purposes and maybe some indications visually, but not actually perform anything */
353} Evas_Event_Flags; /**< Flags for Events */
359 354
360typedef Efl_Input_Object_Pointer_Mode Evas_Object_Pointer_Mode; 355typedef enum _Evas_Aspect_Control
356{
357 EVAS_ASPECT_CONTROL_NONE = 0, /**< Preference on scaling unset */
358 EVAS_ASPECT_CONTROL_NEITHER = 1, /**< Same effect as unset preference on scaling */
359 EVAS_ASPECT_CONTROL_HORIZONTAL = 2, /**< Use all horizontal container space to place an object, using the given aspect */
360 EVAS_ASPECT_CONTROL_VERTICAL = 3, /**< Use all vertical container space to place an object, using the given aspect */
361 EVAS_ASPECT_CONTROL_BOTH = 4 /**< Use all horizontal @b and vertical container spaces to place an object (never growing it out of those bounds), using the given aspect */
362} Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */
363
364typedef enum _Evas_BiDi_Direction
365{
366 EVAS_BIDI_DIRECTION_NATURAL,
367 EVAS_BIDI_DIRECTION_NEUTRAL = EVAS_BIDI_DIRECTION_NATURAL,
368 EVAS_BIDI_DIRECTION_LTR,
369 EVAS_BIDI_DIRECTION_RTL,
370 EVAS_BIDI_DIRECTION_INHERIT
371} Evas_BiDi_Direction;
361 372
362#define EVAS_OBJECT_POINTER_MODE_AUTOGRAB EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB 373/**
363#define EVAS_OBJECT_POINTER_MODE_NOGRAB EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB 374 * How the mouse pointer should be handled by Evas.
364#define EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB_NO_REPEAT_UPDOWN 375 *
376 * In the mode #EVAS_OBJECT_POINTER_MODE_AUTOGRAB, when a mouse button
377 * is pressed down over an object and held, with the mouse pointer
378 * being moved outside of it, the pointer still behaves as being bound
379 * to that object, albeit out of its drawing region. When the button
380 * is released, the event will be fed to the object, that may check if
381 * the final position is over it or not and do something about it.
382 *
383 * In the mode #EVAS_OBJECT_POINTER_MODE_NOGRAB, the pointer will
384 * always be bound to the object right below it.
385 *
386 * @ingroup Evas_Object_Group_Extras
387 */
388typedef enum _Evas_Object_Pointer_Mode
389{
390 EVAS_OBJECT_POINTER_MODE_AUTOGRAB, /**< default, X11-like */
391 EVAS_OBJECT_POINTER_MODE_NOGRAB, /**< pointer always bound to the object right below it */
392 EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN /**< useful on object with "repeat events" enabled, where mouse/touch up and down events WONT be repeated to objects and these objects wont be auto-grabbed. @since 1.2 */
393} Evas_Object_Pointer_Mode; /**< How the mouse pointer should be handled by Evas. */
365 394
366// FIXME: Move to Evas_Legacy.h 395// FIXME: Move to Evas_Legacy.h
367/** Identifier of callbacks to be set for Evas canvases or Evas objects. */ 396/** Identifier of callbacks to be set for Evas canvases or Evas objects. */
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 617e323be0..0d6319457c 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -50,7 +50,7 @@ _new_default_device_find(Evas_Public_Data *e, Evas_Device *old_dev)
50 50
51 EINA_LIST_FOREACH(e->devices, l, dev) 51 EINA_LIST_FOREACH(e->devices, l, dev)
52 { 52 {
53 if (efl_input_device_type_get(dev) != old_class) 53 if ((Evas_Device_Class)efl_input_device_type_get(dev) != old_class)
54 continue; 54 continue;
55 55
56 def = dev; 56 def = dev;
@@ -400,7 +400,7 @@ evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas)
400 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 400 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
401 Evas_Public_Data *edata = efl_data_scope_get(d->evas, EVAS_CANVAS_CLASS); 401 Evas_Public_Data *edata = efl_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
402 402
403 if (d->klass == clas) 403 if ((Evas_Device_Class)d->klass == clas)
404 return; 404 return;
405 405
406 if (_is_pointer(d->klass)) 406 if (_is_pointer(d->klass))
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2f4b7a0c4c..ad0eaf82d6 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1554,7 +1554,7 @@ _efl_canvas_object_efl_gfx_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protecte
1554 if (!sz.w && !sz.h) return; 1554 if (!sz.w && !sz.h) return;
1555 _evas_object_size_hint_alloc(eo_obj, obj); 1555 _evas_object_size_hint_alloc(eo_obj, obj);
1556 } 1556 }
1557 if ((obj->size_hints->aspect.mode == aspect) && 1557 if ((obj->size_hints->aspect.mode == (Evas_Aspect_Control)aspect) &&
1558 (obj->size_hints->aspect.size.w == sz.w) && 1558 (obj->size_hints->aspect.size.w == sz.w) &&
1559 (obj->size_hints->aspect.size.h == sz.h)) return; 1559 (obj->size_hints->aspect.size.h == sz.h)) return;
1560 obj->size_hints->aspect.mode = aspect; 1560 obj->size_hints->aspect.mode = aspect;
@@ -2354,15 +2354,15 @@ _efl_canvas_object_render_parent_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_P
2354} 2354}
2355 2355
2356EOLIAN static void 2356EOLIAN static void
2357_efl_canvas_object_paragraph_direction_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_BiDi_Direction dir EINA_UNUSED) 2357_efl_canvas_object_paragraph_direction_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Text_Bidirectional_Type dir EINA_UNUSED)
2358{ 2358{
2359 return; 2359 return;
2360} 2360}
2361 2361
2362EOLIAN static Evas_BiDi_Direction 2362EOLIAN static Efl_Text_Bidirectional_Type
2363_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) 2363_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
2364{ 2364{
2365 return EVAS_BIDI_DIRECTION_NEUTRAL; 2365 return (Efl_Text_Bidirectional_Type)EVAS_BIDI_DIRECTION_NEUTRAL;
2366} 2366}
2367 2367
2368EOLIAN static void 2368EOLIAN static void
@@ -2426,7 +2426,7 @@ EAPI void
2426evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) 2426evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
2427{ 2427{
2428 Eina_Size2D sz = { 0, 0 }; 2428 Eina_Size2D sz = { 0, 0 };
2429 efl_gfx_hint_aspect_get(obj, aspect, &sz); 2429 efl_gfx_hint_aspect_get(obj, (Efl_Gfx_Hint_Aspect*)aspect, &sz);
2430 if (w) *w = sz.w; 2430 if (w) *w = sz.w;
2431 if (h) *h = sz.h; 2431 if (h) *h = sz.h;
2432} 2432}
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 46dee1df9d..289b61a878 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1798,16 +1798,16 @@ _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
1798 1798
1799EOLIAN static void 1799EOLIAN static void
1800_efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o, 1800_efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o,
1801 Evas_BiDi_Direction dir) 1801 Efl_Text_Bidirectional_Type dir)
1802{ 1802{
1803 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1803 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1804 Evas_Smart_Data *parent; 1804 Evas_Smart_Data *parent;
1805 1805
1806 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || 1806 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == (Evas_BiDi_Direction)dir)) ||
1807 (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT))) 1807 (o->inherit_paragraph_direction && ((Evas_BiDi_Direction)dir == EVAS_BIDI_DIRECTION_INHERIT)))
1808 return; 1808 return;
1809 1809
1810 if (dir == EVAS_BIDI_DIRECTION_INHERIT) 1810 if (dir == (Efl_Text_Bidirectional_Type)EVAS_BIDI_DIRECTION_INHERIT)
1811 { 1811 {
1812 o->inherit_paragraph_direction = EINA_TRUE; 1812 o->inherit_paragraph_direction = EINA_TRUE;
1813 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL; 1813 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL;
@@ -1836,10 +1836,10 @@ _efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Sma
1836 _efl_canvas_group_group_paragraph_direction_set_internal(eo_obj, o->paragraph_direction); 1836 _efl_canvas_group_group_paragraph_direction_set_internal(eo_obj, o->paragraph_direction);
1837} 1837}
1838 1838
1839EOLIAN static Evas_BiDi_Direction 1839EOLIAN static Efl_Text_Bidirectional_Type
1840_efl_canvas_group_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 1840_efl_canvas_group_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
1841{ 1841{
1842 return o->paragraph_direction; 1842 return (Efl_Text_Bidirectional_Type)o->paragraph_direction;
1843} 1843}
1844 1844
1845EOLIAN static const Eo * 1845EOLIAN static const Eo *
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 021b817548..cac8602100 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1108,7 +1108,7 @@ _evas_text_efl_text_text_get(const Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
1108 return o->cur.utf8_text; 1108 return o->cur.utf8_text;
1109} 1109}
1110 1110
1111EOLIAN static Evas_BiDi_Direction 1111EOLIAN static Efl_Text_Bidirectional_Type
1112_evas_text_direction_get(const Eo *eo_obj, Evas_Text_Data *o) 1112_evas_text_direction_get(const Eo *eo_obj, Evas_Text_Data *o)
1113{ 1113{
1114#ifdef BIDI_SUPPORT 1114#ifdef BIDI_SUPPORT
@@ -1137,7 +1137,7 @@ _evas_text_direction_get(const Eo *eo_obj, Evas_Text_Data *o)
1137 } 1137 }
1138#endif 1138#endif
1139 1139
1140 return o->bidi_dir; 1140 return (Efl_Text_Bidirectional_Type)o->bidi_dir;
1141} 1141}
1142 1142
1143EOLIAN static Evas_Coord 1143EOLIAN static Evas_Coord
@@ -2376,16 +2376,16 @@ evas_object_text_filter_source_set(Evas_Object *obj, const char *name, Evas_Obje
2376 2376
2377EOLIAN static void 2377EOLIAN static void
2378_evas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data *o, 2378_evas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data *o,
2379 Evas_BiDi_Direction dir) 2379 Efl_Text_Bidirectional_Type dir)
2380{ 2380{
2381#ifdef BIDI_SUPPORT 2381#ifdef BIDI_SUPPORT
2382 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 2382 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
2383 2383
2384 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || 2384 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == (Evas_BiDi_Direction)dir)) ||
2385 (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT))) 2385 (o->inherit_paragraph_direction && ((Evas_BiDi_Direction)dir == EVAS_BIDI_DIRECTION_INHERIT)))
2386 return; 2386 return;
2387 2387
2388 if (dir == EVAS_BIDI_DIRECTION_INHERIT) 2388 if (dir == (Efl_Text_Bidirectional_Type)EVAS_BIDI_DIRECTION_INHERIT)
2389 { 2389 {
2390 o->inherit_paragraph_direction = EINA_TRUE; 2390 o->inherit_paragraph_direction = EINA_TRUE;
2391 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL; 2391 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL;
@@ -2414,11 +2414,11 @@ _evas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data
2414#endif 2414#endif
2415} 2415}
2416 2416
2417EOLIAN static Evas_BiDi_Direction 2417EOLIAN static Efl_Text_Bidirectional_Type
2418_evas_text_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, 2418_evas_text_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED,
2419 Evas_Text_Data *o) 2419 Evas_Text_Data *o)
2420{ 2420{
2421 return o->paragraph_direction; 2421 return (Efl_Text_Bidirectional_Type)o->paragraph_direction;
2422} 2422}
2423 2423
2424EOLIAN static void 2424EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index ce96dc9997..63eddd46a3 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -14987,16 +14987,16 @@ _evas_object_textblock_rehint(Evas_Object *eo_obj)
14987EOLIAN static void 14987EOLIAN static void
14988_efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, 14988_efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
14989 Efl_Canvas_Text_Data *o, 14989 Efl_Canvas_Text_Data *o,
14990 Evas_BiDi_Direction dir) 14990 Efl_Text_Bidirectional_Type dir)
14991{ 14991{
14992#ifdef BIDI_SUPPORT 14992#ifdef BIDI_SUPPORT
14993 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14993 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14994 14994
14995 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || 14995 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == (Evas_BiDi_Direction)dir)) ||
14996 (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT))) 14996 (o->inherit_paragraph_direction && ((Evas_BiDi_Direction)dir == EVAS_BIDI_DIRECTION_INHERIT)))
14997 return; 14997 return;
14998 14998
14999 if (dir == EVAS_BIDI_DIRECTION_INHERIT) 14999 if (dir == (Efl_Text_Bidirectional_Type)EVAS_BIDI_DIRECTION_INHERIT)
15000 { 15000 {
15001 o->inherit_paragraph_direction = EINA_TRUE; 15001 o->inherit_paragraph_direction = EINA_TRUE;
15002 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL; 15002 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL;
@@ -15027,11 +15027,11 @@ _efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
15027#endif 15027#endif
15028} 15028}
15029 15029
15030EOLIAN static Evas_BiDi_Direction 15030EOLIAN static Efl_Text_Bidirectional_Type
15031_efl_canvas_text_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, 15031_efl_canvas_text_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED,
15032 Efl_Canvas_Text_Data *o) 15032 Efl_Canvas_Text_Data *o)
15033{ 15033{
15034 return o->paragraph_direction; 15034 return (Efl_Text_Bidirectional_Type)o->paragraph_direction;
15035} 15035}
15036 15036
15037static int 15037static int
diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c
index dd72980cd0..188e9c244b 100644
--- a/src/tests/evas/evas_test_object_smart.c
+++ b/src/tests/evas/evas_test_object_smart.c
@@ -122,7 +122,7 @@ EFL_START_TEST(evas_object_smart_paragraph_direction)
122 evas_textblock_cursor_geometry_get(cur, &x, &y, &w, &h, &dir, 122 evas_textblock_cursor_geometry_get(cur, &x, &y, &w, &h, &dir,
123 EVAS_TEXTBLOCK_CURSOR_UNDER); 123 EVAS_TEXTBLOCK_CURSOR_UNDER);
124 fail_if(dir == EVAS_BIDI_DIRECTION_RTL); 124 fail_if(dir == EVAS_BIDI_DIRECTION_RTL);
125 fail_if(evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL); 125 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL);
126 126
127 /* Change paragraph direction of smart parent object */ 127 /* Change paragraph direction of smart parent object */
128 evas_object_paragraph_direction_set(smart_obj, EVAS_BIDI_DIRECTION_RTL); 128 evas_object_paragraph_direction_set(smart_obj, EVAS_BIDI_DIRECTION_RTL);
@@ -131,7 +131,7 @@ EFL_START_TEST(evas_object_smart_paragraph_direction)
131 EVAS_TEXTBLOCK_CURSOR_UNDER); 131 EVAS_TEXTBLOCK_CURSOR_UNDER);
132 fail_if(dir != EVAS_BIDI_DIRECTION_RTL); 132 fail_if(dir != EVAS_BIDI_DIRECTION_RTL);
133 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh)); 133 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh));
134 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL); 134 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL);
135 135
136 /* The paragraph direction of smart member object has to be reset 136 /* The paragraph direction of smart member object has to be reset
137 if smart member object is removed from smart parent. */ 137 if smart member object is removed from smart parent. */
@@ -142,7 +142,7 @@ EFL_START_TEST(evas_object_smart_paragraph_direction)
142 EVAS_TEXTBLOCK_CURSOR_UNDER); 142 EVAS_TEXTBLOCK_CURSOR_UNDER);
143 fail_if(dir == EVAS_BIDI_DIRECTION_RTL); 143 fail_if(dir == EVAS_BIDI_DIRECTION_RTL);
144 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh)); 144 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh));
145 fail_if(evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL); 145 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL);
146 146
147 /* The paragraph direction of smart member object has to be changed 147 /* The paragraph direction of smart member object has to be changed
148 if smart member object is appended to smart parent. */ 148 if smart member object is appended to smart parent. */
@@ -153,7 +153,7 @@ EFL_START_TEST(evas_object_smart_paragraph_direction)
153 EVAS_TEXTBLOCK_CURSOR_UNDER); 153 EVAS_TEXTBLOCK_CURSOR_UNDER);
154 fail_if(dir != EVAS_BIDI_DIRECTION_RTL); 154 fail_if(dir != EVAS_BIDI_DIRECTION_RTL);
155 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh)); 155 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh));
156 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL); 156 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL);
157 157
158 /* Ignore smart parent's paragraph direction */ 158 /* Ignore smart parent's paragraph direction */
159 evas_object_paragraph_direction_set(tb, EVAS_BIDI_DIRECTION_NEUTRAL); 159 evas_object_paragraph_direction_set(tb, EVAS_BIDI_DIRECTION_NEUTRAL);
@@ -163,7 +163,7 @@ EFL_START_TEST(evas_object_smart_paragraph_direction)
163 EVAS_TEXTBLOCK_CURSOR_UNDER); 163 EVAS_TEXTBLOCK_CURSOR_UNDER);
164 fail_if(dir == EVAS_BIDI_DIRECTION_RTL); 164 fail_if(dir == EVAS_BIDI_DIRECTION_RTL);
165 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh)); 165 fail_if((x >= xx) || (y != yy) || (w != ww) || (h != hh));
166 fail_if(evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL); 166 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL);
167 167
168 evas_object_smart_member_del(tb); 168 evas_object_smart_member_del(tb);
169 evas_object_smart_member_del(to); 169 evas_object_smart_member_del(to);
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index 7c66fc96c0..929c88ddab 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -387,26 +387,26 @@ EFL_START_TEST(evas_text_set_get)
387 387
388 /* Direction of an empty text should be NEUTRAL */ 388 /* Direction of an empty text should be NEUTRAL */
389 evas_object_text_text_set(to, ""); 389 evas_object_text_text_set(to, "");
390 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_NEUTRAL); 390 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_NEUTRAL);
391 391
392 /* LTR paragraphs */ 392 /* LTR paragraphs */
393 evas_object_text_text_set(to, "Test נסיון"); 393 evas_object_text_text_set(to, "Test נסיון");
394 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR); 394 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR);
395 395
396 /* RTL paragraphs */ 396 /* RTL paragraphs */
397 evas_object_text_text_set(to, "נסיון test"); 397 evas_object_text_text_set(to, "נסיון test");
398#ifdef HAVE_FRIBIDI 398#ifdef HAVE_FRIBIDI
399 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL); 399 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL);
400#else 400#else
401 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR); 401 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR);
402#endif 402#endif
403 403
404#ifdef HAVE_FRIBIDI 404#ifdef HAVE_FRIBIDI
405 /* Check direction with evas_object_paragraph_direction_set API */ 405 /* Check direction with evas_object_paragraph_direction_set API */
406 evas_object_text_text_set(to, "12345"); 406 evas_object_text_text_set(to, "12345");
407 fail_if(evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL); 407 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) == EVAS_BIDI_DIRECTION_RTL);
408 evas_object_paragraph_direction_set(to, EVAS_BIDI_DIRECTION_RTL); 408 evas_object_paragraph_direction_set(to, EVAS_BIDI_DIRECTION_RTL);
409 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL); 409 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL);
410 evas_object_paragraph_direction_set(to, EVAS_BIDI_DIRECTION_NEUTRAL); 410 evas_object_paragraph_direction_set(to, EVAS_BIDI_DIRECTION_NEUTRAL);
411#endif 411#endif
412 412
@@ -478,9 +478,9 @@ EFL_START_TEST(evas_text_bidi)
478 evas_object_text_font_set(to, font, size); 478 evas_object_text_font_set(to, font, size);
479 479
480 evas_object_text_text_set(to, buf); 480 evas_object_text_text_set(to, buf);
481 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR); 481 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_LTR);
482 evas_object_text_text_set(to, "בדיקה"); 482 evas_object_text_text_set(to, "בדיקה");
483 fail_if(evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL); 483 fail_if((Evas_BiDi_Direction)evas_object_text_direction_get(to) != EVAS_BIDI_DIRECTION_RTL);
484 484
485 /* With RTL text coords should be monotontically decreasing. */ 485 /* With RTL text coords should be monotontically decreasing. */
486 evas_object_text_text_set(to, "נסיון..."); 486 evas_object_text_text_set(to, "נסיון...");