summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-29 14:52:33 +0100
committerTom Hacohen <tom@stosb.com>2015-05-29 14:52:33 +0100
commitedd361b420adc46f206b11f72dc6965da1633098 (patch)
tree5afc5eae616b54d949712e1455f251d004f3f74f
parent05746637807d3d1a44c1ba9fcc77f320c677b4a2 (diff)
Evas: Move evas aspect control to eolian and start using it.
-rw-r--r--src/lib/evas/Evas_Common.h9
-rw-r--r--src/lib/evas/canvas/evas_object.eo2
-rw-r--r--src/lib/evas/evas_types.eot8
3 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index bed52eb76f..795ecde334 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -396,15 +396,6 @@ struct _Evas_Precision_Position /** A position with precision*/
396 Evas_Coord_Precision_Point canvas; /**< position on the canvas */ 396 Evas_Coord_Precision_Point canvas; /**< position on the canvas */
397}; 397};
398 398
399typedef enum _Evas_Aspect_Control
400{
401 EVAS_ASPECT_CONTROL_NONE = 0, /**< Preference on scaling unset */
402 EVAS_ASPECT_CONTROL_NEITHER = 1, /**< Same effect as unset preference on scaling */
403 EVAS_ASPECT_CONTROL_HORIZONTAL = 2, /**< Use all horizontal container space to place an object, using the given aspect */
404 EVAS_ASPECT_CONTROL_VERTICAL = 3, /**< Use all vertical container space to place an object, using the given aspect */
405 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 */
406} Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */
407
408typedef enum _Evas_Display_Mode 399typedef enum _Evas_Display_Mode
409{ 400{
410 EVAS_DISPLAY_MODE_NONE = 0, /**<Default mode */ 401 EVAS_DISPLAY_MODE_NONE = 0, /**<Default mode */
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 831438df8e..ea2442a8a1 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -378,7 +378,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
378 @see evas_object_size_hint_aspect_set() */ 378 @see evas_object_size_hint_aspect_set() */
379 } 379 }
380 values { 380 values {
381 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. */
382 w: Evas.Coord; /*@ Integer to use as aspect width ratio term. */ 382 w: Evas.Coord; /*@ Integer to use as aspect width ratio term. */
383 h: Evas.Coord; /*@ Integer to use as aspect height ratio term. */ 383 h: Evas.Coord; /*@ Integer to use as aspect height ratio term. */
384 } 384 }
diff --git a/src/lib/evas/evas_types.eot b/src/lib/evas/evas_types.eot
index 1bb6b767de..178337d16b 100644
--- a/src/lib/evas/evas_types.eot
+++ b/src/lib/evas/evas_types.eot
@@ -1 +1,9 @@
1type Evas.Coord: int; /*@ A type for coordinates */ 1type Evas.Coord: int; /*@ A type for coordinates */
2enum Evas.Aspect_Control {
3 /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set() */
4 none = 0, /**< Preference on scaling unset */
5 neither = 1, /**< Same effect as unset preference on scaling */
6 horizontal = 2, /**< Use all horizontal container space to place an object, using the given aspect */
7 vertical = 3, /**< Use all vertical container space to place an object, using the given aspect */
8 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 */
9}