summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-06-01 12:12:03 +0100
committerTom Hacohen <tom@stosb.com>2015-06-01 12:12:03 +0100
commit5e43550937fb945e70b09491b0f86fc1f7b3003d (patch)
tree96221a7be2634f779b2c98078f8f6ab8c69c97f1 /src/lib/evas
parent72488cb26b752ed6332daac10589def069801903 (diff)
Evas table: Migrate types to .eo files.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Common.h14
-rw-r--r--src/lib/evas/canvas/evas_table.eo31
2 files changed, 23 insertions, 22 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index de558708f5..8c538ea0b1 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -203,20 +203,6 @@ typedef enum _Evas_Font_Hinting_Flags
203 EVAS_FONT_HINTING_BYTECODE /**< Bytecode font hinting */ 203 EVAS_FONT_HINTING_BYTECODE /**< Bytecode font hinting */
204} Evas_Font_Hinting_Flags; /**< Flags for Font Hinting */ 204} Evas_Font_Hinting_Flags; /**< Flags for Font Hinting */
205 205
206/**
207 * How to pack items into cells in a table.
208 * @ingroup Evas_Object_Table
209 *
210 * @see evas_object_table_homogeneous_set() for an explanation of the function of
211 * each one.
212 */
213typedef enum _Evas_Object_Table_Homogeneous_Mode
214{
215 EVAS_OBJECT_TABLE_HOMOGENEOUS_NONE = 0,
216 EVAS_OBJECT_TABLE_HOMOGENEOUS_TABLE = 1,
217 EVAS_OBJECT_TABLE_HOMOGENEOUS_ITEM = 2
218} Evas_Object_Table_Homogeneous_Mode; /**< Table cell pack mode. */
219
220typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */ 206typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; /**< A generic rectangle handle */
221typedef struct _Evas_Point Evas_Point; /**< integer point */ 207typedef struct _Evas_Point Evas_Point; /**< integer point */
222 208
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 62da830776..d9f9142e3e 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -1,3 +1,18 @@
1/* XXX: Remove the Object_ part once the relevant Eolian bugs are fixed. */
2enum Evas.Object_Table.Homogeneous_Mode {
3 /**
4 * How to pack items into cells in a table.
5 * @ingroup Evas_Object_Table
6 *
7 * @see evas_object_table_homogeneous_set() for an explanation of the function of
8 * each one.
9 */
10 legacy: Evas_Object_Table_Homogeneous;
11 none = 0,
12 table = 1,
13 item = 2
14}
15
1class Evas.Table (Evas.Smart_Clipped) 16class Evas.Table (Evas.Smart_Clipped)
2{ 17{
3 legacy_prefix: evas_object_table; 18 legacy_prefix: evas_object_table;
@@ -54,7 +69,7 @@ class Evas.Table (Evas.Smart_Clipped)
54 @see evas_object_table_homogeneous_set() */ 69 @see evas_object_table_homogeneous_set() */
55 } 70 }
56 values { 71 values {
57 homogeneous: Evas_Object_Table_Homogeneous_Mode; 72 homogeneous: Evas.Object_Table.Homogeneous_Mode;
58 } 73 }
59 } 74 }
60 @property align { 75 @property align {
@@ -81,8 +96,8 @@ class Evas.Table (Evas.Smart_Clipped)
81 Get padding between cells. */ 96 Get padding between cells. */
82 } 97 }
83 values { 98 values {
84 horizontal: Evas_Coord; 99 horizontal: Evas.Coord;
85 vertical: Evas_Coord; 100 vertical: Evas.Coord;
86 } 101 }
87 } 102 }
88 @property mirrored { 103 @property mirrored {
@@ -145,7 +160,7 @@ class Evas.Table (Evas.Smart_Clipped)
145 row: ushort; 160 row: ushort;
146 } 161 }
147 values { 162 values {
148 child: Evas_Object *; 163 child: Evas.Object *;
149 } 164 }
150 } 165 }
151 clear { 166 clear {
@@ -178,7 +193,7 @@ class Evas.Table (Evas.Smart_Clipped)
178 193
179 @see evas_object_table_add() */ 194 @see evas_object_table_add() */
180 195
181 return: Evas_Object * @warn_unused; 196 return: Evas.Object * @warn_unused;
182 } 197 }
183 pack_get @const { 198 pack_get @const {
184 /*@ 199 /*@
@@ -188,7 +203,7 @@ class Evas.Table (Evas.Smart_Clipped)
188 @since 1.1 */ 203 @since 1.1 */
189 return: bool; 204 return: bool;
190 params { 205 params {
191 @in child: Evas_Object *; /*@ The child object to add. */ 206 @in child: Evas.Object *; /*@ The child object to add. */
192 @out col: ushort; /*@ pointer to store relative-horizontal position to place child. */ 207 @out col: ushort; /*@ pointer to store relative-horizontal position to place child. */
193 @out row: ushort; /*@ pointer to store relative-vertical position to place child. */ 208 @out row: ushort; /*@ pointer to store relative-vertical position to place child. */
194 @out colspan: ushort; /*@ pointer to store how many relative-horizontal position to use for this child. */ 209 @out colspan: ushort; /*@ pointer to store how many relative-horizontal position to use for this child. */
@@ -209,7 +224,7 @@ class Evas.Table (Evas.Smart_Clipped)
209 224
210 return: bool; 225 return: bool;
211 params { 226 params {
212 @in child: Evas_Object * @nonull; /*@ The child object to add. */ 227 @in child: Evas.Object * @nonull; /*@ The child object to add. */
213 @in col: ushort; /*@ relative-horizontal position to place child. */ 228 @in col: ushort; /*@ relative-horizontal position to place child. */
214 @in row: ushort; /*@ relative-vertical position to place child. */ 229 @in row: ushort; /*@ relative-vertical position to place child. */
215 @in colspan: ushort; /*@ how many relative-horizontal position to use for this child. */ 230 @in colspan: ushort; /*@ how many relative-horizontal position to use for this child. */
@@ -228,7 +243,7 @@ class Evas.Table (Evas.Smart_Clipped)
228 243
229 return: bool; 244 return: bool;
230 params { 245 params {
231 @in child: Evas_Object * @nonull; 246 @in child: Evas.Object * @nonull;
232 } 247 }
233 } 248 }
234 } 249 }