tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=edd361b420adc46f206b11f72dc6965da1633098
commit edd361b420adc46f206b11f72dc6965da1633098
Author: Tom Hacohen <t...@stosb.com>
Date: Fri May 29 14:52:33 2015 +0100
Evas: Move evas aspect control to eolian and start using it.
---
src/lib/evas/Evas_Common.h | 9 ---------
src/lib/evas/canvas/evas_object.eo | 2 +-
src/lib/evas/evas_types.eot | 8 ++++++++
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index bed52eb..795ecde 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*/
Evas_Coord_Precision_Point canvas; /**< position on the canvas */
};
-typedef enum _Evas_Aspect_Control
-{
- EVAS_ASPECT_CONTROL_NONE = 0, /**< Preference on scaling unset */
- EVAS_ASPECT_CONTROL_NEITHER = 1, /**< Same effect as unset preference on
scaling */
- EVAS_ASPECT_CONTROL_HORIZONTAL = 2, /**< Use all horizontal container space
to place an object, using the given aspect */
- EVAS_ASPECT_CONTROL_VERTICAL = 3, /**< Use all vertical container space to
place an object, using the given aspect */
- 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 */
-} Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used
for evas_object_size_hint_aspect_set() */
-
typedef enum _Evas_Display_Mode
{
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 831438d..ea2442a 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
@see evas_object_size_hint_aspect_set() */
}
values {
- aspect: Evas_Aspect_Control; /*@ The policy/type of aspect ratio
to apply to @p obj. */
+ aspect: Evas.Aspect_Control; /*@ The policy/type of aspect ratio
to apply to @p obj. */
w: Evas.Coord; /*@ Integer to use as aspect width ratio term. */
h: Evas.Coord; /*@ Integer to use as aspect height ratio term. */
}
diff --git a/src/lib/evas/evas_types.eot b/src/lib/evas/evas_types.eot
index 1bb6b76..178337d 100644
--- a/src/lib/evas/evas_types.eot
+++ b/src/lib/evas/evas_types.eot
@@ -1 +1,9 @@
type Evas.Coord: int; /*@ A type for coordinates */
+enum Evas.Aspect_Control {
+ /**< Aspect types/policies for scaling size hints, used for
evas_object_size_hint_aspect_set() */
+ none = 0, /**< Preference on scaling unset */
+ neither = 1, /**< Same effect as unset preference on scaling */
+ horizontal = 2, /**< Use all horizontal container space to place an object,
using the given aspect */
+ vertical = 3, /**< Use all vertical container space to place an object,
using the given aspect */
+ 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 */
+}
--
