diff options
author | Tom Hacohen <tom@stosb.com> | 2015-05-29 14:49:28 +0100 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2015-05-29 14:49:28 +0100 |
commit | 05746637807d3d1a44c1ba9fcc77f320c677b4a2 (patch) | |
tree | 70bc6e76ac6d95afaca905f7556a2800c02f5e68 /src | |
parent | bfe92631c6f6339e46c1a22b4754e61065a5c3bc (diff) |
Evas: Move evas coord to eolian and start using it.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/evas/Evas_Common.h | 1 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_object.eo | 30 | ||||
-rw-r--r-- | src/lib/evas/evas_types.eot | 1 |
3 files changed, 17 insertions, 15 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index d2f0f6268b..bed52eb76f 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h | |||
@@ -338,7 +338,6 @@ typedef struct _Evas_Video_Surface Evas_Video_Surface; | |||
338 | 338 | ||
339 | typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */ | 339 | typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */ |
340 | 340 | ||
341 | typedef int Evas_Coord;/**< A type for coordinates */; | ||
342 | typedef int Evas_Font_Size; /**< A type for font size */ | 341 | typedef int Evas_Font_Size; /**< A type for font size */ |
343 | typedef int Evas_Angle; /**< A type for angle */ | 342 | typedef int Evas_Angle; /**< A type for angle */ |
344 | 343 | ||
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index 9e9eee2314..831438df8e 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo | |||
@@ -1,3 +1,5 @@ | |||
1 | import evas_types; | ||
2 | |||
1 | abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack) | 3 | abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack) |
2 | { | 4 | { |
3 | eo_prefix: evas_obj; | 5 | eo_prefix: evas_obj; |
@@ -42,8 +44,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
42 | @see evas_object_size_hint_max_set() */ | 44 | @see evas_object_size_hint_max_set() */ |
43 | } | 45 | } |
44 | values { | 46 | values { |
45 | w: Evas_Coord; /*@ Integer to use as the maximum width hint. */ | 47 | w: Evas.Coord; /*@ Integer to use as the maximum width hint. */ |
46 | h: Evas_Coord; /*@ Integer to use as the maximum height hint. */ | 48 | h: Evas.Coord; /*@ Integer to use as the maximum height hint. */ |
47 | } | 49 | } |
48 | } | 50 | } |
49 | @property size_hint_request { | 51 | @property size_hint_request { |
@@ -76,8 +78,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
76 | @see evas_object_size_hint_request_set() */ | 78 | @see evas_object_size_hint_request_set() */ |
77 | } | 79 | } |
78 | values { | 80 | values { |
79 | w: Evas_Coord; /*@ Integer to use as the preferred width hint. */ | 81 | w: Evas.Coord; /*@ Integer to use as the preferred width hint. */ |
80 | h: Evas_Coord; /*@ Integer to use as the preferred height hint. */ | 82 | h: Evas.Coord; /*@ Integer to use as the preferred height hint. */ |
81 | } | 83 | } |
82 | } | 84 | } |
83 | @property type { | 85 | @property type { |
@@ -156,8 +158,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
156 | @see evas_object_size_hint_min_set() for an example */ | 158 | @see evas_object_size_hint_min_set() for an example */ |
157 | } | 159 | } |
158 | values { | 160 | values { |
159 | w: Evas_Coord; /*@ Integer to use as the minimum width hint. */ | 161 | w: Evas.Coord; /*@ Integer to use as the minimum width hint. */ |
160 | h: Evas_Coord; /*@ Integer to use as the minimum height hint. */ | 162 | h: Evas.Coord; /*@ Integer to use as the minimum height hint. */ |
161 | } | 163 | } |
162 | } | 164 | } |
163 | @property pointer_mode { | 165 | @property pointer_mode { |
@@ -377,8 +379,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
377 | } | 379 | } |
378 | values { | 380 | values { |
379 | aspect: Evas_Aspect_Control; /*@ The policy/type of aspect ratio to apply to @p obj. */ | 381 | aspect: Evas_Aspect_Control; /*@ The policy/type of aspect ratio to apply to @p obj. */ |
380 | w: Evas_Coord; /*@ Integer to use as aspect width ratio term. */ | 382 | w: Evas.Coord; /*@ Integer to use as aspect width ratio term. */ |
381 | h: Evas_Coord; /*@ Integer to use as aspect height ratio term. */ | 383 | h: Evas.Coord; /*@ Integer to use as aspect height ratio term. */ |
382 | } | 384 | } |
383 | } | 385 | } |
384 | @property clip { | 386 | @property clip { |
@@ -500,10 +502,10 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
500 | @see evas_object_size_hint_padding_set() */ | 502 | @see evas_object_size_hint_padding_set() */ |
501 | } | 503 | } |
502 | values { | 504 | values { |
503 | l: Evas_Coord; /*@ Integer to specify left padding. */ | 505 | l: Evas.Coord; /*@ Integer to specify left padding. */ |
504 | r: Evas_Coord; /*@ Integer to specify right padding. */ | 506 | r: Evas.Coord; /*@ Integer to specify right padding. */ |
505 | t: Evas_Coord; /*@ Integer to specify top padding. */ | 507 | t: Evas.Coord; /*@ Integer to specify top padding. */ |
506 | b: Evas_Coord; /*@ Integer to specify bottom padding. */ | 508 | b: Evas.Coord; /*@ Integer to specify bottom padding. */ |
507 | } | 509 | } |
508 | } | 510 | } |
509 | @property repeat_events { | 511 | @property repeat_events { |
@@ -1257,8 +1259,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac | |||
1257 | their @c move() smart function definition. */ | 1259 | their @c move() smart function definition. */ |
1258 | 1260 | ||
1259 | params { | 1261 | params { |
1260 | @in dx: Evas_Coord; /*@ horizontal offset (delta). */ | 1262 | @in dx: Evas.Coord; /*@ horizontal offset (delta). */ |
1261 | @in dy: Evas_Coord; /*@ vertical offset (delta). */ | 1263 | @in dy: Evas.Coord; /*@ vertical offset (delta). */ |
1262 | } | 1264 | } |
1263 | } | 1265 | } |
1264 | smart_type_check_ptr @const { | 1266 | smart_type_check_ptr @const { |
diff --git a/src/lib/evas/evas_types.eot b/src/lib/evas/evas_types.eot index e69de29bb2..1bb6b767de 100644 --- a/src/lib/evas/evas_types.eot +++ b/src/lib/evas/evas_types.eot | |||
@@ -0,0 +1 @@ | |||
type Evas.Coord: int; /*@ A type for coordinates */ | |||