enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl_ui_flip: finish legacy removal from eo 

ref 5ca4e42957
ref D8138

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8213
This commit is contained in:
Mike Blumenkrantz 2019-03-06 20:19:02 -05:00 committed by Cedric BAIL
parent 93c4f4f390
commit 5c50d8db31
5 changed files with 54 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/elementary/efl_ui_flip.c
View File

@ -1959,7 +1959,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
}
EOLIAN static void
_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode mode)
_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Efl_Ui_Flip_Mode mode)
{
if (sd->next_state == front) return;
@ -1967,7 +1967,7 @@ _efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode
}
EOLIAN static void
_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Elm_Flip_Mode mode)
_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Flip_Mode mode)
{
_internal_elm_flip_go_to(obj, sd, !sd->state, mode);
}
@ -2349,6 +2349,7 @@ ELM_PART_CONTENT_DEFAULT_GET(efl_ui_flip, "front")
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip)
#include "efl_ui_flip.eo.c"
#include "efl_ui_flip_eo.legacy.c"
#include "efl_ui_flip_legacy_eo.h"

1
src/lib/elementary/efl_ui_flip.eo
View File

@ -30,7 +30,6 @@ enum Efl.Ui.Flip_Interaction
class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
{
[[Efl UI flip class]]
legacy_prefix: elm_flip;
methods {
@property interaction {
set {

12
src/lib/elementary/efl_ui_flip_eo.legacy.c
View File

@ -1,30 +1,30 @@
EAPI void
elm_flip_interaction_set(Efl_Ui_Flip *obj, Efl_Ui_Flip_Interaction mode)
elm_flip_interaction_set(Elm_Flip *obj, Elm_Flip_Interaction mode)
{
efl_ui_flip_interaction_set(obj, mode);
}
EAPI Efl_Ui_Flip_Interaction
elm_flip_interaction_get(const Efl_Ui_Flip *obj)
EAPI Elm_Flip_Interaction
elm_flip_interaction_get(const Elm_Flip *obj)
{
return efl_ui_flip_interaction_get(obj);
}
EAPI Eina_Bool
elm_flip_front_visible_get(const Efl_Ui_Flip *obj)
elm_flip_front_visible_get(const Elm_Flip *obj)
{
return efl_ui_flip_front_visible_get(obj);
}
EAPI void
elm_flip_go(Efl_Ui_Flip *obj, Efl_Ui_Flip_Mode mode)
elm_flip_go(Elm_Flip *obj, Elm_Flip_Mode mode)
{
efl_ui_flip_go(obj, mode);
}
EAPI void
elm_flip_go_to(Efl_Ui_Flip *obj, Eina_Bool front, Efl_Ui_Flip_Mode mode)
elm_flip_go_to(Elm_Flip *obj, Eina_Bool front, Elm_Flip_Mode mode)
{
efl_ui_flip_go_to(obj, front, mode);
}

56
src/lib/elementary/efl_ui_flip_eo.legacy.h
View File

@ -1,52 +1,6 @@
#ifndef _EFL_UI_FLIP_EO_LEGACY_H_
#define _EFL_UI_FLIP_EO_LEGACY_H_
#ifndef _EFL_UI_FLIP_EO_CLASS_TYPE
#define _EFL_UI_FLIP_EO_CLASS_TYPE
typedef Eo Efl_Ui_Flip;
#endif
#ifndef _EFL_UI_FLIP_EO_TYPES
#define _EFL_UI_FLIP_EO_TYPES
/** Efl UI flip mode
*
* @ingroup Efl_Ui
*/
typedef enum
{
EFL_UI_FLIP_ROTATE_Y_CENTER_AXIS = 0, /**< Rotate Y center axis flip mode */
EFL_UI_FLIP_ROTATE_X_CENTER_AXIS, /**< Rotate X center axis flip mode */
EFL_UI_FLIP_ROTATE_XZ_CENTER_AXIS, /**< Rotate XZ center axis flip mode */
EFL_UI_FLIP_ROTATE_YZ_CENTER_AXIS, /**< Rotate YZ center axis flip mode */
EFL_UI_FLIP_CUBE_LEFT, /**< Cube left flip mode */
EFL_UI_FLIP_CUBE_RIGHT, /**< Cube right flip mode */
EFL_UI_FLIP_CUBE_UP, /**< Cube up flip mode */
EFL_UI_FLIP_CUBE_DOWN, /**< Cube down flip mode */
EFL_UI_FLIP_PAGE_LEFT, /**< Page left flip mode */
EFL_UI_FLIP_PAGE_RIGHT, /**< Page right flip mode */
EFL_UI_FLIP_PAGE_UP, /**< Page up flip mode */
EFL_UI_FLIP_PAGE_DOWN, /**< Page down flip mode */
EFL_UI_FLIP_CROSS_FADE /**< Cross fade flip mode */
} Efl_Ui_Flip_Mode;
/** Efl UI flip interaction
*
* @ingroup Efl_Ui
*/
typedef enum
{
EFL_UI_FLIP_INTERACTION_NONE = 0, /**< No interaction */
EFL_UI_FLIP_INTERACTION_ROTATE, /**< Rotate interaction */
EFL_UI_FLIP_INTERACTION_CUBE, /**< Cube interaction */
EFL_UI_FLIP_INTERACTION_PAGE /**< Page interaction */
} Efl_Ui_Flip_Interaction;
#endif
/**
* @brief Set the interactive flip mode.
*
@ -70,7 +24,7 @@ typedef enum
*
* @ingroup Elm_Flip_Group
*/
EAPI void elm_flip_interaction_set(Efl_Ui_Flip *obj, Efl_Ui_Flip_Interaction mode);
EAPI void elm_flip_interaction_set(Eo *obj, Elm_Flip_Interaction mode);
/**
* @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
*
* @ingroup Elm_Flip_Group
*/
EAPI Efl_Ui_Flip_Interaction elm_flip_interaction_get(const Efl_Ui_Flip *obj);
EAPI Elm_Flip_Interaction elm_flip_interaction_get(const Eo *obj);
/**
* @brief Get flip front visibility state.
@ -92,7 +46,7 @@ EAPI Efl_Ui_Flip_Interaction elm_flip_interaction_get(const Efl_Ui_Flip *obj);
*
* @ingroup Elm_Flip_Group
*/
EAPI Eina_Bool elm_flip_front_visible_get(const Efl_Ui_Flip *obj);
EAPI Eina_Bool elm_flip_front_visible_get(const Eo *obj);
@ -139,7 +93,7 @@ EAPI Eina_Bool elm_flip_front_visible_get(const Efl_Ui_Flip *obj);
*
* @ingroup Elm_Flip_Group
*/
EAPI void elm_flip_go(Efl_Ui_Flip *obj, Efl_Ui_Flip_Mode mode);
EAPI void elm_flip_go(Eo *obj, Elm_Flip_Mode mode);
/**
* @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);
*
* @ingroup Elm_Flip_Group
*/
EAPI void elm_flip_go_to(Efl_Ui_Flip *obj, Eina_Bool front, Efl_Ui_Flip_Mode mode);
EAPI void elm_flip_go_to(Eo *obj, Eina_Bool front, Elm_Flip_Mode mode);
#endif

70
src/lib/elementary/efl_ui_flip_legacy.h
View File

@ -1,30 +1,39 @@
#include "efl_ui_flip_eo.legacy.h"
typedef Eo Elm_Flip;
typedef Efl_Ui_Flip_Interaction Elm_Flip_Interaction;
#define ELM_FLIP_INTERACTION_NONE EFL_UI_FLIP_INTERACTION_NONE
#define ELM_FLIP_INTERACTION_ROTATE EFL_UI_FLIP_INTERACTION_ROTATE
#define ELM_FLIP_INTERACTION_CUBE EFL_UI_FLIP_INTERACTION_CUBE
#define ELM_FLIP_INTERACTION_PAGE EFL_UI_FLIP_INTERACTION_PAGE
/** Elm flip mode
*
* @ingroup Elm_Flip
*/
typedef enum
{
ELM_FLIP_ROTATE_Y_CENTER_AXIS = 0, /**< Rotate Y center axis flip mode */
ELM_FLIP_ROTATE_X_CENTER_AXIS, /**< Rotate X center axis flip mode */
ELM_FLIP_ROTATE_XZ_CENTER_AXIS, /**< Rotate XZ center axis flip mode */
ELM_FLIP_ROTATE_YZ_CENTER_AXIS, /**< Rotate YZ center axis flip mode */
ELM_FLIP_CUBE_LEFT, /**< Cube left flip mode */
ELM_FLIP_CUBE_RIGHT, /**< Cube right flip mode */
ELM_FLIP_CUBE_UP, /**< Cube up flip mode */
ELM_FLIP_CUBE_DOWN, /**< Cube down flip mode */
ELM_FLIP_PAGE_LEFT, /**< Page left flip mode */
ELM_FLIP_PAGE_RIGHT, /**< Page right flip mode */
ELM_FLIP_PAGE_UP, /**< Page up flip mode */
ELM_FLIP_PAGE_DOWN, /**< Page down flip mode */
ELM_FLIP_CROSS_FADE /**< Cross fade flip mode */
} Elm_Flip_Mode;
/** Efl UI flip interaction
*
* @ingroup Efl_Ui
*/
typedef enum
{
ELM_FLIP_INTERACTION_NONE = 0, /**< No interaction */
ELM_FLIP_INTERACTION_ROTATE, /**< Rotate interaction */
ELM_FLIP_INTERACTION_CUBE, /**< Cube interaction */
ELM_FLIP_INTERACTION_PAGE /**< Page interaction */
} Elm_Flip_Interaction;
typedef Efl_Ui_Flip_Mode Elm_Flip_Mode;
#define ELM_FLIP_ROTATE_Y_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_Y_CENTER_AXIS
#define ELM_FLIP_ROTATE_X_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_X_CENTER_AXIS
#define ELM_FLIP_ROTATE_XZ_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_XZ_CENTER_AXIS
#define ELM_FLIP_ROTATE_YZ_CENTER_AXIS EFL_UI_FLIP_MODE_ROTATE_YZ_CENTER_AXIS
#define ELM_FLIP_CUBE_LEFT EFL_UI_FLIP_MODE_CUBE_LEFT
#define ELM_FLIP_CUBE_RIGHT EFL_UI_FLIP_MODE_CUBE_RIGHT
#define ELM_FLIP_CUBE_UP EFL_UI_FLIP_MODE_CUBE_UP
#define ELM_FLIP_CUBE_DOWN EFL_UI_FLIP_MODE_CUBE_DOWN
#define ELM_FLIP_PAGE_LEFT EFL_UI_FLIP_MODE_PAGE_LEFT
#define ELM_FLIP_PAGE_RIGHT EFL_UI_FLIP_MODE_PAGE_RIGHT
#define ELM_FLIP_PAGE_UP EFL_UI_FLIP_MODE_PAGE_UP
#define ELM_FLIP_PAGE_DOWN EFL_UI_FLIP_MODE_PAGE_DOWN
#define ELM_FLIP_CROSS_FADE EFL_UI_FLIP_MODE_CROSS_FADE
typedef enum
{
@ -58,9 +67,9 @@ typedef enum
*
* @param[in] hitsize The amount of that dimension (0.0 to 1.0) to use.
*
* @ingroup Efl_Ui_Flip
* @ingroup Elm_Flip
*/
EAPI void elm_flip_interaction_direction_hitsize_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, double hitsize);
EAPI void elm_flip_interaction_direction_hitsize_set(Elm_Flip *obj, Elm_Flip_Direction dir, double hitsize);
/**
* @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_
*
* @return The size set for that direction.
*
* @ingroup Efl_Ui_Flip
* @ingroup Elm_Flip
*/
EAPI double elm_flip_interaction_direction_hitsize_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir);
EAPI double elm_flip_interaction_direction_hitsize_get(Elm_Flip *obj, Elm_Flip_Direction dir);
/**
* @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
*
* @param[in] enabled If that direction is enabled or not.
*
* @ingroup Efl_Ui_Flip
* @ingroup Elm_Flip
*/
EAPI void elm_flip_interaction_direction_enabled_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled);
EAPI void elm_flip_interaction_direction_enabled_set(Elm_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled);
/**
* @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_
*
* @return If that direction is enabled or not.
*
* @ingroup Efl_Ui_Flip
* @ingroup Elm_Flip
*/
EAPI Eina_Bool elm_flip_interaction_direction_enabled_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir);
EAPI Eina_Bool elm_flip_interaction_direction_enabled_get(Elm_Flip *obj, Elm_Flip_Direction dir);
/**
* @brief Add a new flip to the parent
@ -124,3 +133,4 @@ EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
* @ingroup Elm_Flip
*/
EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
#include "efl_ui_flip_eo.legacy.h"