yakov pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ef81df4964e877ce88db084d0a55abbf931bfcbb
commit ef81df4964e877ce88db084d0a55abbf931bfcbb
Author: Yakov Goldberg <yako...@samsung.com>
Date: Sun May 17 13:33:36 2015 +0300
elm_flip: Move enums to elm_flip.eo
Move enums from elm_flip_common.h to elm_flip.eo in order to make them
more accessible for bindings. Delete elm_flip_common.h.
---
src/lib/Makefile.am | 1 -
src/lib/elm_flip.eo | 56 +++++++++++++++++++++++++++++++++++++++++------
src/lib/elm_flip.h | 1 -
src/lib/elm_flip_common.h | 40 ---------------------------------
4 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 473570d..8cef646 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -217,7 +217,6 @@ elm_entry_eo.h \
elm_entry_legacy.h \
elm_finger.h \
elm_flip.h \
-elm_flip_common.h \
elm_flip_eo.h \
elm_flip_legacy.h \
elm_flipselector.h \
diff --git a/src/lib/elm_flip.eo b/src/lib/elm_flip.eo
index 19b536b..c3cac2b 100644
--- a/src/lib/elm_flip.eo
+++ b/src/lib/elm_flip.eo
@@ -1,3 +1,45 @@
+enum Elm.Flip.Mode
+{
+ /*@
+ @ingroup Flip
+ */
+ legacy: elm_flip;
+ rotate_y_center_axis,
+ rotate_x_center_axis,
+ rotate_xz_center_axis,
+ rotate_yz_center_axis,
+ cube_left,
+ cube_right,
+ cube_up,
+ cube_down,
+ page_left,
+ page_right,
+ page_up,
+ page_down
+}
+
+enum Elm.Flip.Interaction
+{
+ /*@
+ @ingroup Flip
+ */
+ none,
+ rotate,
+ cube,
+ page
+}
+
+enum Elm.Flip.Direction
+{
+ /*@
+ @ingroup Flip
+ */
+ up = 0, /*@< Allows interaction with the top of the widget */
+ down, /*@< Allows interaction with the bottom of the widget */
+ left, /*@< Allows interaction with the left portion of the widget */
+ right /*@< Allows interaction with the right portion of the widget */
+}
+
class Elm.Flip (Elm.Container)
{
eo_prefix: elm_obj_flip;
@@ -37,7 +79,7 @@ class Elm.Flip (Elm.Container)
@ingroup Flip */
}
values {
- Elm_Flip_Interaction mode; /*@ The interactive flip mode to use */
+ Elm.Flip.Interaction mode; /*@ The interactive flip mode to use */
}
}
@property front_visible {
@@ -74,7 +116,7 @@ class Elm.Flip (Elm.Container)
@ingroup Flip */
params {
- @in Elm_Flip_Direction dir; /*@ The hit area to set */
+ @in Elm.Flip.Direction dir; /*@ The hit area to set */
@in double hitsize; /*@ The amount of that dimension (0.0 to 1.0)
to use */
}
}
@@ -91,7 +133,7 @@ class Elm.Flip (Elm.Container)
return: double;
params {
- @in Elm_Flip_Direction dir; /*@ The direction to check */
+ @in Elm.Flip.Direction dir; /*@ The direction to check */
}
}
interaction_direction_enabled_set {
@@ -111,7 +153,7 @@ class Elm.Flip (Elm.Container)
@ingroup Flip */
params {
- @in Elm_Flip_Direction dir; /*@ The direction to change */
+ @in Elm.Flip.Direction dir; /*@ The direction to change */
@in bool enabled; /*@ If that direction is enabled or not */
}
}
@@ -129,7 +171,7 @@ class Elm.Flip (Elm.Container)
return: bool;
params {
- @in Elm_Flip_Direction dir; /*@ The direction to check */
+ @in Elm.Flip.Direction dir; /*@ The direction to check */
}
}
go {
@@ -181,7 +223,7 @@ class Elm.Flip (Elm.Container)
@ingroup Flip */
params {
- @in Elm_Flip_Mode mode; /*@ The mode type */
+ @in Elm.Flip.Mode mode; /*@ The mode type */
}
}
go_to {
@@ -234,7 +276,7 @@ class Elm.Flip (Elm.Container)
params {
@in bool front; /*@ if @c EINA_TRUE, makes front visible,
otherwise makes back. */
- @in Elm_Flip_Mode mode; /*@ The mode type */
+ @in Elm.Flip.Mode mode; /*@ The mode type */
}
}
}
diff --git a/src/lib/elm_flip.h b/src/lib/elm_flip.h
index 7a38602..8effc46 100644
--- a/src/lib/elm_flip.h
+++ b/src/lib/elm_flip.h
@@ -38,7 +38,6 @@
* @{
*/
-#include "elm_flip_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_flip_eo.h"
#endif
diff --git a/src/lib/elm_flip_common.h b/src/lib/elm_flip_common.h
deleted file mode 100644
index eb81d2e..0000000
--- a/src/lib/elm_flip_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @ingroup Flip
- */
-typedef enum
-{
- ELM_FLIP_ROTATE_Y_CENTER_AXIS,
- ELM_FLIP_ROTATE_X_CENTER_AXIS,
- ELM_FLIP_ROTATE_XZ_CENTER_AXIS,
- ELM_FLIP_ROTATE_YZ_CENTER_AXIS,
- ELM_FLIP_CUBE_LEFT,
- ELM_FLIP_CUBE_RIGHT,
- ELM_FLIP_CUBE_UP,
- ELM_FLIP_CUBE_DOWN,
- ELM_FLIP_PAGE_LEFT,
- ELM_FLIP_PAGE_RIGHT,
- ELM_FLIP_PAGE_UP,
- ELM_FLIP_PAGE_DOWN
-} Elm_Flip_Mode;
-
-/**
- * @ingroup Flip
- */
-typedef enum
-{
- ELM_FLIP_INTERACTION_NONE,
- ELM_FLIP_INTERACTION_ROTATE,
- ELM_FLIP_INTERACTION_CUBE,
- ELM_FLIP_INTERACTION_PAGE
-} Elm_Flip_Interaction;
-
-/**
- * @ingroup Flip
- */
-typedef enum
-{
- ELM_FLIP_DIRECTION_UP = 0, /**< Allows interaction with the top of the
widget */
- ELM_FLIP_DIRECTION_DOWN, /**< Allows interaction with the bottom of the
widget */
- ELM_FLIP_DIRECTION_LEFT, /**< Allows interaction with the left portion of
the widget */
- ELM_FLIP_DIRECTION_RIGHT /**< Allows interaction with the right portion of
the widget */
-} Elm_Flip_Direction;
--
