summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-05-17 13:33:36 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-05-17 16:03:45 +0300
commitef81df4964e877ce88db084d0a55abbf931bfcbb (patch)
tree653b58f67047c57789f13b2997faf799e8da4f7f
parent246e270c9fb1f3bd055562ce01b1a74e16d4c56d (diff)
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.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_flip.eo56
-rw-r--r--src/lib/elm_flip.h1
-rw-r--r--src/lib/elm_flip_common.h40
4 files changed, 49 insertions, 49 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 473570dad..8cef6469a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -217,7 +217,6 @@ elm_entry_eo.h \
217elm_entry_legacy.h \ 217elm_entry_legacy.h \
218elm_finger.h \ 218elm_finger.h \
219elm_flip.h \ 219elm_flip.h \
220elm_flip_common.h \
221elm_flip_eo.h \ 220elm_flip_eo.h \
222elm_flip_legacy.h \ 221elm_flip_legacy.h \
223elm_flipselector.h \ 222elm_flipselector.h \
diff --git a/src/lib/elm_flip.eo b/src/lib/elm_flip.eo
index 19b536bd5..c3cac2b5b 100644
--- a/src/lib/elm_flip.eo
+++ b/src/lib/elm_flip.eo
@@ -1,3 +1,45 @@
1enum Elm.Flip.Mode
2{
3 /*@
4 @ingroup Flip
5 */
6 legacy: elm_flip;
7 rotate_y_center_axis,
8 rotate_x_center_axis,
9 rotate_xz_center_axis,
10 rotate_yz_center_axis,
11 cube_left,
12 cube_right,
13 cube_up,
14 cube_down,
15 page_left,
16 page_right,
17 page_up,
18 page_down
19}
20
21enum Elm.Flip.Interaction
22{
23 /*@
24 @ingroup Flip
25 */
26 none,
27 rotate,
28 cube,
29 page
30}
31
32enum Elm.Flip.Direction
33{
34 /*@
35 @ingroup Flip
36 */
37 up = 0, /*@< Allows interaction with the top of the widget */
38 down, /*@< Allows interaction with the bottom of the widget */
39 left, /*@< Allows interaction with the left portion of the widget */
40 right /*@< Allows interaction with the right portion of the widget */
41}
42
1class Elm.Flip (Elm.Container) 43class Elm.Flip (Elm.Container)
2{ 44{
3 eo_prefix: elm_obj_flip; 45 eo_prefix: elm_obj_flip;
@@ -37,7 +79,7 @@ class Elm.Flip (Elm.Container)
37 @ingroup Flip */ 79 @ingroup Flip */
38 } 80 }
39 values { 81 values {
40 Elm_Flip_Interaction mode; /*@ The interactive flip mode to use */ 82 Elm.Flip.Interaction mode; /*@ The interactive flip mode to use */
41 } 83 }
42 } 84 }
43 @property front_visible { 85 @property front_visible {
@@ -74,7 +116,7 @@ class Elm.Flip (Elm.Container)
74 @ingroup Flip */ 116 @ingroup Flip */
75 117
76 params { 118 params {
77 @in Elm_Flip_Direction dir; /*@ The hit area to set */ 119 @in Elm.Flip.Direction dir; /*@ The hit area to set */
78 @in double hitsize; /*@ The amount of that dimension (0.0 to 1.0) to use */ 120 @in double hitsize; /*@ The amount of that dimension (0.0 to 1.0) to use */
79 } 121 }
80 } 122 }
@@ -91,7 +133,7 @@ class Elm.Flip (Elm.Container)
91 133
92 return: double; 134 return: double;
93 params { 135 params {
94 @in Elm_Flip_Direction dir; /*@ The direction to check */ 136 @in Elm.Flip.Direction dir; /*@ The direction to check */
95 } 137 }
96 } 138 }
97 interaction_direction_enabled_set { 139 interaction_direction_enabled_set {
@@ -111,7 +153,7 @@ class Elm.Flip (Elm.Container)
111 @ingroup Flip */ 153 @ingroup Flip */
112 154
113 params { 155 params {
114 @in Elm_Flip_Direction dir; /*@ The direction to change */ 156 @in Elm.Flip.Direction dir; /*@ The direction to change */
115 @in bool enabled; /*@ If that direction is enabled or not */ 157 @in bool enabled; /*@ If that direction is enabled or not */
116 } 158 }
117 } 159 }
@@ -129,7 +171,7 @@ class Elm.Flip (Elm.Container)
129 171
130 return: bool; 172 return: bool;
131 params { 173 params {
132 @in Elm_Flip_Direction dir; /*@ The direction to check */ 174 @in Elm.Flip.Direction dir; /*@ The direction to check */
133 } 175 }
134 } 176 }
135 go { 177 go {
@@ -181,7 +223,7 @@ class Elm.Flip (Elm.Container)
181 @ingroup Flip */ 223 @ingroup Flip */
182 224
183 params { 225 params {
184 @in Elm_Flip_Mode mode; /*@ The mode type */ 226 @in Elm.Flip.Mode mode; /*@ The mode type */
185 } 227 }
186 } 228 }
187 go_to { 229 go_to {
@@ -234,7 +276,7 @@ class Elm.Flip (Elm.Container)
234 276
235 params { 277 params {
236 @in bool front; /*@ if @c EINA_TRUE, makes front visible, otherwise makes back. */ 278 @in bool front; /*@ if @c EINA_TRUE, makes front visible, otherwise makes back. */
237 @in Elm_Flip_Mode mode; /*@ The mode type */ 279 @in Elm.Flip.Mode mode; /*@ The mode type */
238 } 280 }
239 } 281 }
240 } 282 }
diff --git a/src/lib/elm_flip.h b/src/lib/elm_flip.h
index 7a38602b3..8effc4641 100644
--- a/src/lib/elm_flip.h
+++ b/src/lib/elm_flip.h
@@ -38,7 +38,6 @@
38 * @{ 38 * @{
39 */ 39 */
40 40
41#include "elm_flip_common.h"
42#ifdef EFL_EO_API_SUPPORT 41#ifdef EFL_EO_API_SUPPORT
43#include "elm_flip_eo.h" 42#include "elm_flip_eo.h"
44#endif 43#endif
diff --git a/src/lib/elm_flip_common.h b/src/lib/elm_flip_common.h
deleted file mode 100644
index eb81d2ee0..000000000
--- a/src/lib/elm_flip_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
1/**
2 * @ingroup Flip
3 */
4typedef enum
5{
6 ELM_FLIP_ROTATE_Y_CENTER_AXIS,
7 ELM_FLIP_ROTATE_X_CENTER_AXIS,
8 ELM_FLIP_ROTATE_XZ_CENTER_AXIS,
9 ELM_FLIP_ROTATE_YZ_CENTER_AXIS,
10 ELM_FLIP_CUBE_LEFT,
11 ELM_FLIP_CUBE_RIGHT,
12 ELM_FLIP_CUBE_UP,
13 ELM_FLIP_CUBE_DOWN,
14 ELM_FLIP_PAGE_LEFT,
15 ELM_FLIP_PAGE_RIGHT,
16 ELM_FLIP_PAGE_UP,
17 ELM_FLIP_PAGE_DOWN
18} Elm_Flip_Mode;
19
20/**
21 * @ingroup Flip
22 */
23typedef enum
24{
25 ELM_FLIP_INTERACTION_NONE,
26 ELM_FLIP_INTERACTION_ROTATE,
27 ELM_FLIP_INTERACTION_CUBE,
28 ELM_FLIP_INTERACTION_PAGE
29} Elm_Flip_Interaction;
30
31/**
32 * @ingroup Flip
33 */
34typedef enum
35{
36 ELM_FLIP_DIRECTION_UP = 0, /**< Allows interaction with the top of the widget */
37 ELM_FLIP_DIRECTION_DOWN, /**< Allows interaction with the bottom of the widget */
38 ELM_FLIP_DIRECTION_LEFT, /**< Allows interaction with the left portion of the widget */
39 ELM_FLIP_DIRECTION_RIGHT /**< Allows interaction with the right portion of the widget */
40} Elm_Flip_Direction;