tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b2370c476630c9ab55cf24b34740a11ee3a7e604
commit b2370c476630c9ab55cf24b34740a11ee3a7e604
Author: Tom Hacohen <t...@stosb.com>
Date: Mon Jun 1 10:44:45 2015 +0100
Evas text: Migrate types to .eo.
---
src/lib/evas/Evas_Common.h | 40 ----------------------------------
src/lib/evas/canvas/evas_text.eo | 44 +++++++++++++++++++-------------------
src/lib/evas/canvas/evas_types.eot | 39 +++++++++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 62 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 1864fb8..5b7af72 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -57,16 +57,6 @@ EAPI extern Evas_Version * evas_version;
* @todo finish api documentation
*/
-/* BiDi exposed stuff */
-/*FIXME: document */
-typedef enum _Evas_BiDi_Direction
-{
- EVAS_BIDI_DIRECTION_NATURAL,
- EVAS_BIDI_DIRECTION_NEUTRAL = EVAS_BIDI_DIRECTION_NATURAL,
- EVAS_BIDI_DIRECTION_LTR,
- EVAS_BIDI_DIRECTION_RTL
-} Evas_BiDi_Direction;
-
/**
* Identifier of callbacks to be set for Evas canvases or Evas
* objects.
@@ -3212,36 +3202,6 @@ EAPI Eina_Bool
evas_object_image_extension_can_load_fast_get
do { x = ((x) & ~EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION) | (s); } while (0)
/**
- * @typedef Evas_Text_Style_Type
- *
- * Types of styles to be applied on text objects. The @c
- * EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be ORed together with others
- * imposing shadow, to change shadow's direction
- */
-typedef enum _Evas_Text_Style_Type
-{
- EVAS_TEXT_STYLE_PLAIN, /**< plain, standard text */
- EVAS_TEXT_STYLE_SHADOW, /**< text with shadow underneath */
- EVAS_TEXT_STYLE_OUTLINE, /**< text with an outline */
- EVAS_TEXT_STYLE_SOFT_OUTLINE, /**< text with a soft outline */
- EVAS_TEXT_STYLE_GLOW, /**< text with a glow effect */
- EVAS_TEXT_STYLE_OUTLINE_SHADOW, /**< text with both outline and shadow
effects */
- EVAS_TEXT_STYLE_FAR_SHADOW, /**< text with (far) shadow underneath */
- EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW, /**< text with outline and soft
shadow effects combined */
- EVAS_TEXT_STYLE_SOFT_SHADOW, /**< text with (soft) shadow underneath */
- EVAS_TEXT_STYLE_FAR_SOFT_SHADOW, /**< text with (far soft) shadow
underneath */
-
- /* OR these to modify shadow direction (3 bits needed) */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT = (0x0 << 4), /**<
shadow growing to bottom right */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM = (0x1 << 4), /**<
shadow growing to the bottom */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT = (0x2 << 4), /**<
shadow growing to bottom left */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT = (0x3 << 4), /**<
shadow growing to the left */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT = (0x4 << 4), /**<
shadow growing to top left */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP = (0x5 << 4), /**<
shadow growing to the top */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT = (0x6 << 4), /**<
shadow growing to top right */
- EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT = (0x7 << 4) /**< shadow
growing to the right */
-} Evas_Text_Style_Type;
-/**
* @}
*/
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 0b1f004..62a27ee 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -184,7 +184,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
@see evas_object_text_style_set() for more details. */
}
values {
- style: Evas_Text_Style_Type; /*@ a style type. */
+ style: Evas.Text_Style_Type; /*@ a style type. */
}
}
@property glow_color {
@@ -257,12 +257,12 @@ class Evas.Text (Evas.Object, Efl.Text,
Efl.Text_Properties)
}
values {
name: const(char)*; /*@ Object name as used in the program code */
- eobj: Eo*; /*@ Eo object to use through proxy rendering */
+ eobj: Evas.Object *; /*@ Eo object to use through proxy rendering
*/
}
}
@property max_descent {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property style_pad {
@@ -283,56 +283,56 @@ class Evas.Text (Evas.Object, Efl.Text,
Efl.Text_Properties)
Retrieves the direction of the text currently being displayed in
the
text object.
@return the direction of the text */
- return: Evas_BiDi_Direction;
+ return: Evas.BiDi_Direction;
}
}
@property ascent {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property horiz_advance {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property inset {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property max_ascent {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property vert_advance {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
@property descent {
get {
- return: Evas_Coord;
+ return: Evas.Coord;
}
}
last_up_to_pos @const {
/*@ Returns the logical position of the last char in the text up to
the pos given. this is NOT the position of the last char because of the
possibility of RTL in the text. */
return: int(-1);
params {
- @in x: Evas_Coord; /*@ in */
- @in y: Evas_Coord; /*@ in */
+ @in x: Evas.Coord; /*@ in */
+ @in y: Evas.Coord; /*@ in */
}
}
char_coords_get @const {
return: int;
params {
- @in x: Evas_Coord; /*@ in */
- @in y: Evas_Coord; /*@ in */
- @out cx: Evas_Coord; /*@ out */
- @out cy: Evas_Coord; /*@ out */
- @out cw: Evas_Coord; /*@ out */
- @out ch: Evas_Coord; /*@ out */
+ @in x: Evas.Coord; /*@ in */
+ @in y: Evas.Coord; /*@ in */
+ @out cx: Evas.Coord; /*@ out */
+ @out cy: Evas.Coord; /*@ out */
+ @out cw: Evas.Coord; /*@ out */
+ @out ch: Evas.Coord; /*@ out */
}
}
char_pos_get @const {
@@ -349,10 +349,10 @@ class Evas.Text (Evas.Object, Efl.Text,
Efl.Text_Properties)
return: bool;
params {
@in pos: int; /*@ The character position to request co-ordinates
for. */
- @out cx: Evas_Coord; /*@ A pointer to an @c Evas_Coord to store
the X value in (can be NULL). */
- @out cy: Evas_Coord; /*@ A pointer to an @c Evas_Coord to store
the Y value in (can be NULL). */
- @out cw: Evas_Coord; /*@ A pointer to an @c Evas_Coord to store
the Width value in (can be NULL). */
- @out ch: Evas_Coord; /*@ A pointer to an @c Evas_Coord to store
the Height value in (can be NULL). */
+ @out cx: Evas.Coord; /*@ A pointer to an @c Evas_Coord to store
the X value in (can be NULL). */
+ @out cy: Evas.Coord; /*@ A pointer to an @c Evas_Coord to store
the Y value in (can be NULL). */
+ @out cw: Evas.Coord; /*@ A pointer to an @c Evas_Coord to store
the Width value in (can be NULL). */
+ @out ch: Evas.Coord; /*@ A pointer to an @c Evas_Coord to store
the Height value in (can be NULL). */
}
}
}
diff --git a/src/lib/evas/canvas/evas_types.eot
b/src/lib/evas/canvas/evas_types.eot
index bb03fd8..fd64978 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -58,6 +58,45 @@ enum Evas.Display_Mode {
dont_change = 3 /**< Use this mode when an object should not change its
display mode */
}
+enum Evas.BiDi_Direction {
+ /* BiDi exposed stuff */
+ /*FIXME: document */
+ natural = 0,
+ neutral = 0,
+ ltr,
+ rtl
+}
+
+enum Evas.Text_Style_Type {
+ /*@
+ * Types of styles to be applied on text objects. The @c
+ * EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be ORed together with
others
+ * imposing shadow, to change shadow's direction
+ */
+ legacy: Evas_Text_Style;
+
+ plain, /**< plain, standard text */
+ shadow, /**< text with shadow underneath */
+ outline, /**< text with an outline */
+ soft_outline, /**< text with a soft outline */
+ glow, /**< text with a glow effect */
+ outline_shadow, /**< text with both outline and shadow effects */
+ far_shadow, /**< text with (far) shadow underneath */
+ outline_soft_shadow, /**< text with outline and soft shadow effects
combined */
+ soft_shadow, /**< text with (soft) shadow underneath */
+ far_soft_shadow, /**< text with (far soft) shadow underneath */
+
+ /* OR these to modify shadow direction (3 bits needed) */
+ shadow_direction_bottom_right = (0x0 << 4), /**< shadow growing to
bottom right */
+ shadow_direction_bottom = (0x1 << 4), /**< shadow growing to the
bottom */
+ shadow_direction_bottom_left = (0x2 << 4), /**< shadow growing to
bottom left */
+ shadow_direction_left = (0x3 << 4), /**< shadow growing to the
left */
+ shadow_direction_top_left = (0x4 << 4), /**< shadow growing to top
left */
+ shadow_direction_top = (0x5 << 4), /**< shadow growing to the
top */
+ shadow_direction_top_right = (0x6 << 4), /**< shadow growing to top
right */
+ shadow_direction_right = (0x7 << 4) /**< shadow growing to the
right */
+}
+
struct Evas.Map; /*@ An opaque handle to map points
*
* @see evas_map_new()
--
