summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-06 20:19:02 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:16:50 -0800
commit5c50d8db31487a4ec9a540ffc28451e895c52001 (patch)
tree935ca79a84726802f56a87fbea4aec3b0973438e /src
parent93c4f4f390ae13573dd3a13d3a299099f2fd810f (diff)
efl_ui_flip: finish legacy removal from eo
ref 5ca4e42957392b301efd4a6d0838974d03318771 ref D8138 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8213
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_flip.c5
-rw-r--r--src/lib/elementary/efl_ui_flip.eo1
-rw-r--r--src/lib/elementary/efl_ui_flip_eo.legacy.c12
-rw-r--r--src/lib/elementary/efl_ui_flip_eo.legacy.h56
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy.h70
5 files changed, 54 insertions, 90 deletions
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 5b84d40..7f3da3c 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1959,7 +1959,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1959} 1959}
1960 1960
1961EOLIAN static void 1961EOLIAN static void
1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode mode) 1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Efl_Ui_Flip_Mode mode)
1963{ 1963{
1964 if (sd->next_state == front) return; 1964 if (sd->next_state == front) return;
1965 1965
@@ -1967,7 +1967,7 @@ _efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode
1967} 1967}
1968 1968
1969EOLIAN static void 1969EOLIAN static void
1970_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Elm_Flip_Mode mode) 1970_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Flip_Mode mode)
1971{ 1971{
1972 _internal_elm_flip_go_to(obj, sd, !sd->state, mode); 1972 _internal_elm_flip_go_to(obj, sd, !sd->state, mode);
1973} 1973}
@@ -2349,6 +2349,7 @@ ELM_PART_CONTENT_DEFAULT_GET(efl_ui_flip, "front")
2349 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip) 2349 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip)
2350 2350
2351#include "efl_ui_flip.eo.c" 2351#include "efl_ui_flip.eo.c"
2352#include "efl_ui_flip_eo.legacy.c"
2352 2353
2353#include "efl_ui_flip_legacy_eo.h" 2354#include "efl_ui_flip_legacy_eo.h"
2354 2355
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index dfdf090..28e42e4 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -30,7 +30,6 @@ enum Efl.Ui.Flip_Interaction
30class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear 30class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
31{ 31{
32 [[Efl UI flip class]] 32 [[Efl UI flip class]]
33 legacy_prefix: elm_flip;
34 methods { 33 methods {
35 @property interaction { 34 @property interaction {
36 set { 35 set {
diff --git a/src/lib/elementary/efl_ui_flip_eo.legacy.c b/src/lib/elementary/efl_ui_flip_eo.legacy.c
index 6fd3fb2..9968236 100644
--- a/src/lib/elementary/efl_ui_flip_eo.legacy.c
+++ b/src/lib/elementary/efl_ui_flip_eo.legacy.c
@@ -1,30 +1,30 @@
1 1
2EAPI void 2EAPI void
3elm_flip_interaction_set(Efl_Ui_Flip *obj, Efl_Ui_Flip_Interaction mode) 3elm_flip_interaction_set(Elm_Flip *obj, Elm_Flip_Interaction mode)
4{ 4{
5 efl_ui_flip_interaction_set(obj, mode); 5 efl_ui_flip_interaction_set(obj, mode);
6} 6}
7 7
8EAPI Efl_Ui_Flip_Interaction 8EAPI Elm_Flip_Interaction
9elm_flip_interaction_get(const Efl_Ui_Flip *obj) 9elm_flip_interaction_get(const Elm_Flip *obj)
10{ 10{
11 return efl_ui_flip_interaction_get(obj); 11 return efl_ui_flip_interaction_get(obj);
12} 12}
13 13
14EAPI Eina_Bool 14EAPI Eina_Bool
15elm_flip_front_visible_get(const Efl_Ui_Flip *obj) 15elm_flip_front_visible_get(const Elm_Flip *obj)
16{ 16{
17 return efl_ui_flip_front_visible_get(obj); 17 return efl_ui_flip_front_visible_get(obj);
18} 18}
19 19
20EAPI void 20EAPI void
21elm_flip_go(Efl_Ui_Flip *obj, Efl_Ui_Flip_Mode mode) 21elm_flip_go(Elm_Flip *obj, Elm_Flip_Mode mode)
22{ 22{
23 efl_ui_flip_go(obj, mode); 23 efl_ui_flip_go(obj, mode);
24} 24}
25 25
26EAPI void 26EAPI void
27elm_flip_go_to(Efl_Ui_Flip *obj, Eina_Bool front, Efl_Ui_Flip_Mode mode) 27elm_flip_go_to(Elm_Flip *obj, Eina_Bool front, Elm_Flip_Mode mode)
28{ 28{
29 efl_ui_flip_go_to(obj, front, mode); 29 efl_ui_flip_go_to(obj, front, mode);
30} 30}
diff --git a/src/lib/elementary/efl_ui_flip_eo.legacy.h b/src/lib/elementary/efl_ui_flip_eo.legacy.h
index 923625e..a8993e3 100644
--- a/src/lib/elementary/efl_ui_flip_eo.legacy.h
+++ b/src/lib/elementary/efl_ui_flip_eo.legacy.h
@@ -1,52 +1,6 @@
1#ifndef _EFL_UI_FLIP_EO_LEGACY_H_ 1#ifndef _EFL_UI_FLIP_EO_LEGACY_H_
2#define _EFL_UI_FLIP_EO_LEGACY_H_ 2#define _EFL_UI_FLIP_EO_LEGACY_H_
3 3
4#ifndef _EFL_UI_FLIP_EO_CLASS_TYPE
5#define _EFL_UI_FLIP_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Flip;
8
9#endif
10
11#ifndef _EFL_UI_FLIP_EO_TYPES
12#define _EFL_UI_FLIP_EO_TYPES
13
14/** Efl UI flip mode
15 *
16 * @ingroup Efl_Ui
17 */
18typedef enum
19{
20 EFL_UI_FLIP_ROTATE_Y_CENTER_AXIS = 0, /**< Rotate Y center axis flip mode */
21 EFL_UI_FLIP_ROTATE_X_CENTER_AXIS, /**< Rotate X center axis flip mode */
22 EFL_UI_FLIP_ROTATE_XZ_CENTER_AXIS, /**< Rotate XZ center axis flip mode */
23 EFL_UI_FLIP_ROTATE_YZ_CENTER_AXIS, /**< Rotate YZ center axis flip mode */
24 EFL_UI_FLIP_CUBE_LEFT, /**< Cube left flip mode */
25 EFL_UI_FLIP_CUBE_RIGHT, /**< Cube right flip mode */
26 EFL_UI_FLIP_CUBE_UP, /**< Cube up flip mode */
27 EFL_UI_FLIP_CUBE_DOWN, /**< Cube down flip mode */
28 EFL_UI_FLIP_PAGE_LEFT, /**< Page left flip mode */
29 EFL_UI_FLIP_PAGE_RIGHT, /**< Page right flip mode */
30 EFL_UI_FLIP_PAGE_UP, /**< Page up flip mode */
31 EFL_UI_FLIP_PAGE_DOWN, /**< Page down flip mode */
32 EFL_UI_FLIP_CROSS_FADE /**< Cross fade flip mode */
33} Efl_Ui_Flip_Mode;
34
35/** Efl UI flip interaction
36 *
37 * @ingroup Efl_Ui
38 */
39typedef enum
40{
41 EFL_UI_FLIP_INTERACTION_NONE = 0, /**< No interaction */
42 EFL_UI_FLIP_INTERACTION_ROTATE, /**< Rotate interaction */
43 EFL_UI_FLIP_INTERACTION_CUBE, /**< Cube interaction */
44 EFL_UI_FLIP_INTERACTION_PAGE /**< Page interaction */
45} Efl_Ui_Flip_Interaction;
46
47
48#endif
49
50/** 4/**
51 * @brief Set the interactive flip mode. 5 * @brief Set the interactive flip mode.
52 * 6 *
@@ -70,7 +24,7 @@ typedef enum
70 * 24 *
71 * @ingroup Elm_Flip_Group 25 * @ingroup Elm_Flip_Group
72 */ 26 */
73EAPI void elm_flip_interaction_set(Efl_Ui_Flip *obj, Efl_Ui_Flip_Interaction mode); 27EAPI void elm_flip_interaction_set(Eo *obj, Elm_Flip_Interaction mode);
74 28
75/** 29/**
76 * @brief Get the interactive flip mode. 30 * @brief Get the interactive flip mode.
@@ -81,7 +35,7 @@ EAPI void elm_flip_interaction_set(Efl_Ui_Flip *obj, Efl_Ui_Flip_Interaction mod
81 * 35 *
82 * @ingroup Elm_Flip_Group 36 * @ingroup Elm_Flip_Group
83 */ 37 */
84EAPI Efl_Ui_Flip_Interaction elm_flip_interaction_get(const Efl_Ui_Flip *obj); 38EAPI Elm_Flip_Interaction elm_flip_interaction_get(const Eo *obj);
85 39
86/** 40/**
87 * @brief Get flip front visibility state. 41 * @brief Get flip front visibility state.
@@ -92,7 +46,7 @@ EAPI Efl_Ui_Flip_Interaction elm_flip_interaction_get(const Efl_Ui_Flip *obj);
92 * 46 *
93 * @ingroup Elm_Flip_Group 47 * @ingroup Elm_Flip_Group
94 */ 48 */
95EAPI Eina_Bool elm_flip_front_visible_get(const Efl_Ui_Flip *obj); 49EAPI Eina_Bool elm_flip_front_visible_get(const Eo *obj);
96 50
97 51
98 52
@@ -139,7 +93,7 @@ EAPI Eina_Bool elm_flip_front_visible_get(const Efl_Ui_Flip *obj);
139 * 93 *
140 * @ingroup Elm_Flip_Group 94 * @ingroup Elm_Flip_Group
141 */ 95 */
142EAPI void elm_flip_go(Efl_Ui_Flip *obj, Efl_Ui_Flip_Mode mode); 96EAPI void elm_flip_go(Eo *obj, Elm_Flip_Mode mode);
143 97
144/** 98/**
145 * @brief Runs the flip animation to front or back. 99 * @brief Runs the flip animation to front or back.
@@ -181,6 +135,6 @@ EAPI void elm_flip_go(Efl_Ui_Flip *obj, Efl_Ui_Flip_Mode mode);
181 * 135 *
182 * @ingroup Elm_Flip_Group 136 * @ingroup Elm_Flip_Group
183 */ 137 */
184EAPI void elm_flip_go_to(Efl_Ui_Flip *obj, Eina_Bool front, Efl_Ui_Flip_Mode mode); 138EAPI void elm_flip_go_to(Eo *obj, Eina_Bool front, Elm_Flip_Mode mode);
185 139
186#endif 140#endif
diff --git a/src/lib/elementary/efl_ui_flip_legacy.h b/src/lib/elementary/efl_ui_flip_legacy.h
index 659ef08..2965255 100644
--- a/src/lib/elementary/efl_ui_flip_legacy.h
+++ b/src/lib/elementary/efl_ui_flip_legacy.h
@@ -1,30 +1,39 @@
1#include "efl_ui_flip_eo.legacy.h"
2
3typedef Eo Elm_Flip; 1typedef Eo Elm_Flip;
4 2
5typedef Efl_Ui_Flip_Interaction Elm_Flip_Interaction;
6
7#define ELM_FLIP_INTERACTION_NONE EFL_UI_FLIP_INTERACTION_NONE
8#define ELM_FLIP_INTERACTION_ROTATE EFL_UI_FLIP_INTERACTION_ROTATE
9#define ELM_FLIP_INTERACTION_CUBE EFL_UI_FLIP_INTERACTION_CUBE
10#define ELM_FLIP_INTERACTION_PAGE EFL_UI_FLIP_INTERACTION_PAGE
11 3
4/** Elm flip mode
5 *
6 * @ingroup Elm_Flip
7 */
8typedef enum
9{
10 ELM_FLIP_ROTATE_Y_CENTER_AXIS = 0, /**< Rotate Y center axis flip mode */
11 ELM_FLIP_ROTATE_X_CENTER_AXIS, /**< Rotate X center axis flip mode */
12 ELM_FLIP_ROTATE_XZ_CENTER_AXIS, /**< Rotate XZ center axis flip mode */
13 ELM_FLIP_ROTATE_YZ_CENTER_AXIS, /**< Rotate YZ center axis flip mode */
14 ELM_FLIP_CUBE_LEFT, /**< Cube left flip mode */
15 ELM_FLIP_CUBE_RIGHT, /**< Cube right flip mode */
16 ELM_FLIP_CUBE_UP, /**< Cube up flip mode */
17 ELM_FLIP_CUBE_DOWN, /**< Cube down flip mode */
18 ELM_FLIP_PAGE_LEFT, /**< Page left flip mode */
19 ELM_FLIP_PAGE_RIGHT, /**< Page right flip mode */
20 ELM_FLIP_PAGE_UP, /**< Page up flip mode */
21 ELM_FLIP_PAGE_DOWN, /**< Page down flip mode */
22 ELM_FLIP_CROSS_FADE /**< Cross fade flip mode */
23} Elm_Flip_Mode;
12 24
13typedef Efl_Ui_Flip_Mode Elm_Flip_Mode; 25/** Efl UI flip interaction
26 *
27 * @ingroup Efl_Ui
28 */
29typedef enum
30{
31 ELM_FLIP_INTERACTION_NONE = 0, /**< No interaction */
32 ELM_FLIP_INTERACTION_ROTATE, /**< Rotate interaction */
33 ELM_FLIP_INTERACTION_CUBE, /**< Cube interaction */
34 ELM_FLIP_INTERACTION_PAGE /**< Page interaction */
35} Elm_Flip_Interaction;
14 36
15#define ELM_FLIP_ROTATE_Y_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_Y_CENTER_AXIS
16#define ELM_FLIP_ROTATE_X_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_X_CENTER_AXIS
17#define ELM_FLIP_ROTATE_XZ_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_XZ_CENTER_AXIS
18#define ELM_FLIP_ROTATE_YZ_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_YZ_CENTER_AXIS
19#define ELM_FLIP_CUBE_LEFT EFL_UI_FLIP_MODE_CUBE_LEFT
20#define ELM_FLIP_CUBE_RIGHT EFL_UI_FLIP_MODE_CUBE_RIGHT
21#define ELM_FLIP_CUBE_UP EFL_UI_FLIP_MODE_CUBE_UP
22#define ELM_FLIP_CUBE_DOWN EFL_UI_FLIP_MODE_CUBE_DOWN
23#define ELM_FLIP_PAGE_LEFT EFL_UI_FLIP_MODE_PAGE_LEFT
24#define ELM_FLIP_PAGE_RIGHT EFL_UI_FLIP_MODE_PAGE_RIGHT
25#define ELM_FLIP_PAGE_UP EFL_UI_FLIP_MODE_PAGE_UP
26#define ELM_FLIP_PAGE_DOWN EFL_UI_FLIP_MODE_PAGE_DOWN
27#define ELM_FLIP_CROSS_FADE EFL_UI_FLIP_MODE_CROSS_FADE
28 37
29typedef enum 38typedef enum
30{ 39{
@@ -58,9 +67,9 @@ typedef enum
58 * 67 *
59 * @param[in] hitsize The amount of that dimension (0.0 to 1.0) to use. 68 * @param[in] hitsize The amount of that dimension (0.0 to 1.0) to use.
60 * 69 *
61 * @ingroup Efl_Ui_Flip 70 * @ingroup Elm_Flip
62 */ 71 */
63EAPI void elm_flip_interaction_direction_hitsize_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, double hitsize); 72EAPI void elm_flip_interaction_direction_hitsize_set(Elm_Flip *obj, Elm_Flip_Direction dir, double hitsize);
64 73
65/** 74/**
66 * @brief Get the amount of the flip that is sensitive to interactive flip. 75 * @brief Get the amount of the flip that is sensitive to interactive flip.
@@ -69,9 +78,9 @@ EAPI void elm_flip_interaction_direction_hitsize_set(Efl_Ui_Flip *obj, Elm_Flip_
69 * 78 *
70 * @return The size set for that direction. 79 * @return The size set for that direction.
71 * 80 *
72 * @ingroup Efl_Ui_Flip 81 * @ingroup Elm_Flip
73 */ 82 */
74EAPI double elm_flip_interaction_direction_hitsize_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir); 83EAPI double elm_flip_interaction_direction_hitsize_get(Elm_Flip *obj, Elm_Flip_Direction dir);
75 84
76/** 85/**
77 * @brief Set which directions of the flip respond to interactive flip 86 * @brief Set which directions of the flip respond to interactive flip
@@ -86,9 +95,9 @@ EAPI double elm_flip_interaction_direction_hitsize_get(Efl_Ui_Flip *obj, Elm_Fli
86 * 95 *
87 * @param[in] enabled If that direction is enabled or not. 96 * @param[in] enabled If that direction is enabled or not.
88 * 97 *
89 * @ingroup Efl_Ui_Flip 98 * @ingroup Elm_Flip
90 */ 99 */
91EAPI void elm_flip_interaction_direction_enabled_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled); 100EAPI void elm_flip_interaction_direction_enabled_set(Elm_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled);
92 101
93/** 102/**
94 * @brief Get the enabled state of that flip direction. 103 * @brief Get the enabled state of that flip direction.
@@ -97,9 +106,9 @@ EAPI void elm_flip_interaction_direction_enabled_set(Efl_Ui_Flip *obj, Elm_Flip_
97 * 106 *
98 * @return If that direction is enabled or not. 107 * @return If that direction is enabled or not.
99 * 108 *
100 * @ingroup Efl_Ui_Flip 109 * @ingroup Elm_Flip
101 */ 110 */
102EAPI Eina_Bool elm_flip_interaction_direction_enabled_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir); 111EAPI Eina_Bool elm_flip_interaction_direction_enabled_get(Elm_Flip *obj, Elm_Flip_Direction dir);
103 112
104/** 113/**
105 * @brief Add a new flip to the parent 114 * @brief Add a new flip to the parent
@@ -124,3 +133,4 @@ EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
124 * @ingroup Elm_Flip 133 * @ingroup Elm_Flip
125 */ 134 */
126EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y); 135EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
136#include "efl_ui_flip_eo.legacy.h"