forked from enlightenment/efl
Evas: Move BiDi type to Efl.Text
This renames it to Efl.Text.Bidirectional_Type.
This commit is contained in:
parent
fc6ba5561e
commit
f2fafb8044
|
@ -52,6 +52,7 @@ efl_eolian_type_files = \
|
|||
lib/efl/interfaces/efl_gfx_types.eot \
|
||||
lib/efl/interfaces/efl_event_types.eot \
|
||||
lib/efl/interfaces/efl_types.eot \
|
||||
lib/efl/interfaces/efl_text_types.eot \
|
||||
$(NULL)
|
||||
|
||||
efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) \
|
||||
|
|
|
@ -76,6 +76,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
|
|||
#include "interfaces/efl_part.eo.h"
|
||||
#include "interfaces/efl_player.eo.h"
|
||||
#include "interfaces/efl_text.eo.h"
|
||||
#include "interfaces/efl_text_types.eot.h"
|
||||
#include "interfaces/efl_text_properties.eo.h"
|
||||
#include "interfaces/efl_orientation.eo.h"
|
||||
#include "interfaces/efl_flipable.eo.h"
|
||||
|
@ -149,6 +150,7 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
|
|||
#include "interfaces/efl_image.eo.legacy.h"
|
||||
#include "interfaces/efl_image_animated.eo.legacy.h"
|
||||
#include "interfaces/efl_input_device.eo.legacy.h"
|
||||
#include "interfaces/efl_text_types.eot.h"
|
||||
#endif
|
||||
|
||||
typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
enum Efl.Text.Bidirectional_Type {
|
||||
natural = 0,
|
||||
neutral = 0,
|
||||
ltr,
|
||||
rtl,
|
||||
inherit
|
||||
}
|
|
@ -363,6 +363,14 @@ typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect type
|
|||
#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_SIZE_HINT_ASPECT_VERTICAL
|
||||
#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_SIZE_HINT_ASPECT_BOTH
|
||||
|
||||
typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction;
|
||||
|
||||
#define EVAS_BIDI_DIRECTION_NATURAL EFL_TEXT_BIDIRECTIONAL_TYPE_NATURAL
|
||||
#define EVAS_BIDI_DIRECTION_NEUTRAL EFL_TEXT_BIDIRECTIONAL_TYPE_NEUTRAL
|
||||
#define EVAS_BIDI_DIRECTION_LTR EFL_TEXT_BIDIRECTIONAL_TYPE_LTR
|
||||
#define EVAS_BIDI_DIRECTION_RTL EFL_TEXT_BIDIRECTIONAL_TYPE_RTL
|
||||
#define EVAS_BIDI_DIRECTION_INHERIT EFL_TEXT_BIDIRECTIONAL_TYPE_INHERIT
|
||||
|
||||
struct _Evas_Engine_Info /** Generic engine information. Generic info is useless */
|
||||
{
|
||||
int magic; /**< Magic number */
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import evas_types;
|
||||
import efl_text_types;
|
||||
|
||||
abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack,
|
||||
Efl.Animator, Efl.Input.Interface, Efl.Gfx.Size.Hint)
|
||||
|
@ -526,15 +527,12 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack,
|
|||
}
|
||||
@property paragraph_direction {
|
||||
[[This handles text paragraph direction of the given object.
|
||||
Even if the given object is not textblock or text, its smart child objects
|
||||
can inherit the paragraph direction from the given object.
|
||||
The default paragraph direction is @Evas.BiDi_Direction.inherit.]]
|
||||
set {
|
||||
}
|
||||
get {
|
||||
}
|
||||
Even if the given object is not textblock or text, its smart child
|
||||
objects can inherit the paragraph direction from the given object.
|
||||
The default paragraph direction is $inherit.
|
||||
]]
|
||||
values {
|
||||
dir: Evas.BiDi_Direction; [[Paragraph direction for the given object.]]
|
||||
dir: Efl.Text.Bidirectional_Type; [[Paragraph direction for the given object.]]
|
||||
}
|
||||
}
|
||||
clipees_has @const {
|
||||
|
|
|
@ -179,7 +179,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.I
|
|||
[[Retrieves the direction of the text currently being displayed in the
|
||||
text object.]]
|
||||
|
||||
return: Evas.BiDi_Direction;
|
||||
return: Efl.Text.Bidirectional_Type;
|
||||
}
|
||||
}
|
||||
@property ascent {
|
||||
|
|
|
@ -38,16 +38,6 @@ enum Evas.Display_Mode {
|
|||
mode]]
|
||||
}
|
||||
|
||||
enum Evas.BiDi_Direction {
|
||||
/* BiDi exposed stuff */
|
||||
/*FIXME: document */
|
||||
natural = 0,
|
||||
neutral = 0,
|
||||
ltr,
|
||||
rtl,
|
||||
inherit
|
||||
}
|
||||
|
||||
enum Evas.Text_Style_Type {
|
||||
[[Types of styles to be applied on text objects. The
|
||||
EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be ORed together with
|
||||
|
|
Loading…
Reference in New Issue