summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2019-08-07 14:54:45 +0100
committerTom Hacohen <tom@stosb.com>2019-08-07 15:01:22 +0100
commit84e06f7234335836d175cb1583aa91f183b98803 (patch)
treebfdd97c41455694d4e0b7fd16c9e7192dcdba395
parentd11551050d74b0a6d832e65ebf8561031828158d (diff)
Evas: migrate Evas_BiDi_Direction -> Efl_Text_Bidirectional_Type.
-rw-r--r--src/lib/evas/Evas_Common.h14
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c6
2 files changed, 9 insertions, 11 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index bd6102d702..1ae09bf259 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -368,14 +368,12 @@ typedef enum _Evas_Aspect_Control
368 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 */ 368 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 */
369} Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */ 369} Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */
370 370
371typedef enum _Evas_BiDi_Direction 371typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction;
372{ 372#define EVAS_BIDI_DIRECTION_NEUTRAL EFL_TEXT_BIDIRECTIONAL_TYPE_NEUTRAL
373 EVAS_BIDI_DIRECTION_NATURAL, 373#define EVAS_BIDI_DIRECTION_NATURAL EFL_TEXT_BIDIRECTIONAL_TYPE_NATURAL
374 EVAS_BIDI_DIRECTION_NEUTRAL = EVAS_BIDI_DIRECTION_NATURAL, 374#define EVAS_BIDI_DIRECTION_LTR EFL_TEXT_BIDIRECTIONAL_TYPE_LTR
375 EVAS_BIDI_DIRECTION_LTR, 375#define EVAS_BIDI_DIRECTION_RTL EFL_TEXT_BIDIRECTIONAL_TYPE_RTL
376 EVAS_BIDI_DIRECTION_RTL, 376#define EVAS_BIDI_DIRECTION_INHERIT EFL_TEXT_BIDIRECTIONAL_TYPE_INHERIT
377 EVAS_BIDI_DIRECTION_INHERIT
378} Evas_BiDi_Direction;
379 377
380/** 378/**
381 * How the mouse pointer should be handled by Evas. 379 * How the mouse pointer should be handled by Evas.
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 1135527ad2..e069e04ce7 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -15244,11 +15244,11 @@ _efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
15244#ifdef BIDI_SUPPORT 15244#ifdef BIDI_SUPPORT
15245 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15245 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15246 15246
15247 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == (Evas_BiDi_Direction)dir)) || 15247 if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) ||
15248 (o->inherit_paragraph_direction && ((Evas_BiDi_Direction)dir == EVAS_BIDI_DIRECTION_INHERIT))) 15248 (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT)))
15249 return; 15249 return;
15250 15250
15251 if (dir == (Efl_Text_Bidirectional_Type)EVAS_BIDI_DIRECTION_INHERIT) 15251 if (dir == EVAS_BIDI_DIRECTION_INHERIT)
15252 { 15252 {
15253 o->inherit_paragraph_direction = EINA_TRUE; 15253 o->inherit_paragraph_direction = EINA_TRUE;
15254 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL; 15254 Evas_BiDi_Direction parent_dir = EVAS_BIDI_DIRECTION_NEUTRAL;