From: ChunEon Park <chuneon.park@samsung.com>

003_elm_transit.diff.txt (made all effect context APIs private. But
expose
each one façade API to use easy.) 



SVN revision: 55579
This commit is contained in:
ChunEon Park 2010-12-16 07:53:42 +00:00 committed by Carsten Haitzler
parent 7d29c9eece
commit c28e1674ac
3 changed files with 517 additions and 906 deletions

View File

@ -68,7 +68,6 @@ static void
_transit_rotation_translation_color(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
@ -76,44 +75,27 @@ _transit_rotation_translation_color(void *data __UNUSED__, Evas_Object *obj, voi
elm_transit_repeat_times_set(trans, 2);
/* Translation Effect */
effect_context = elm_transit_effect_translation_context_new(-70.0, -150.0,
70.0, 150.0);
elm_transit_effect_add(trans,
elm_transit_effect_translation_op, effect_context,
elm_transit_effect_translation_context_free);
elm_transit_effect_translation_add(trans, -70.0, -150.0, 70.0, 150.0);
/* Color Effect */
effect_context = elm_transit_effect_color_context_new(100, 255, 100,
255, 200, 50, 200, 50);
elm_transit_effect_add(trans,
elm_transit_effect_color_op, effect_context,
elm_transit_effect_color_context_free);
elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50);
/* Rotation Effect */
effect_context = elm_transit_effect_rotation_context_new(0.0,
135.0, EINA_FALSE);
elm_transit_effect_add(trans,
elm_transit_effect_rotation_op, effect_context,
elm_transit_effect_rotation_context_free);
elm_transit_effect_rotation_add(trans, 0.0, 135.0, EINA_FALSE);
}
static void
_transit_wipe(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
elm_transit_auto_reverse_set(trans, EINA_TRUE);
effect_context = \
elm_transit_effect_wipe_context_new(ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE,
ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT);
elm_transit_effect_add(trans,
elm_transit_effect_wipe_op, effect_context,
elm_transit_effect_wipe_context_free);
elm_transit_effect_wipe_add(trans,
ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE,
ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT);
}
static void
@ -123,7 +105,6 @@ _transit_image_animation(void *data, Evas_Object *obj __UNUSED__, void *event_in
char buf[PATH_MAX];
Elm_Transit *trans;
Evas_Object *ic = data;
void *effect_context;
snprintf(buf, sizeof(buf), "%s/images/icon_19.png", PACKAGE_DATA_DIR);
images = eina_list_append(images, eina_stringshare_add(buf));
@ -139,109 +120,75 @@ _transit_image_animation(void *data, Evas_Object *obj __UNUSED__, void *event_in
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, ic);
effect_context = \
elm_transit_effect_image_animation_context_new(images);
elm_transit_effect_add(trans,
elm_transit_effect_image_animation_op, effect_context,
elm_transit_effect_image_animation_context_free);
elm_transit_effect_image_animation_add(trans, images);
}
static void
_transit_resizing(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_transit_resizing(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
trans = elm_transit_add(5.0);
effect_context = elm_transit_effect_resizing_context_new(100, 50, 300, 150);
elm_transit_object_add(trans, obj);
elm_transit_effect_add(trans,
elm_transit_effect_resizing_op, effect_context,
elm_transit_effect_resizing_context_free);
elm_transit_effect_resizing_add(trans, 100, 50, 300, 150);
}
static void
_transit_flip(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
Evas_Object *obj2 = data;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
elm_transit_object_add(trans, obj2);
effect_context = elm_transit_effect_flip_context_new(
ELM_TRANSIT_EFFECT_FLIP_AXIS_X,
EINA_TRUE);
elm_transit_effect_add(trans,
elm_transit_effect_flip_op, effect_context,
elm_transit_effect_flip_context_free);
elm_transit_effect_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_X, EINA_TRUE);
}
static void
_transit_zoom(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_transit_zoom(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
effect_context = elm_transit_effect_zoom_context_new(1.0, 3.0);
elm_transit_effect_add(trans,
elm_transit_effect_zoom_op, effect_context,
elm_transit_effect_zoom_context_free);
elm_transit_effect_zoom_add(trans, 1.0, 3.0);
}
static void
_transit_blend(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
Evas_Object *obj2 = data;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
elm_transit_object_add(trans, obj2);
effect_context = elm_transit_effect_blend_context_new();
elm_transit_effect_add(trans,
elm_transit_effect_blend_op, effect_context,
elm_transit_effect_blend_context_free);
elm_transit_effect_blend_add(trans);
}
static void
_transit_fade(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
Evas_Object *obj2 = data;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
elm_transit_object_add(trans, obj2);
effect_context = elm_transit_effect_fade_context_new();
elm_transit_effect_add(trans,
elm_transit_effect_fade_op, effect_context,
elm_transit_effect_fade_context_free);
elm_transit_effect_fade_add(trans);
}
static void
_transit_resizable_flip(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Transit *trans;
void *effect_context;
Evas_Object *obj2 = data;
trans = elm_transit_add(5.0);
elm_transit_object_add(trans, obj);
elm_transit_object_add(trans, obj2);
effect_context = elm_transit_effect_resizable_flip_context_new(
ELM_TRANSIT_EFFECT_FLIP_AXIS_Y,
EINA_TRUE);
elm_transit_effect_add(trans,
elm_transit_effect_resizable_flip_op, effect_context,
elm_transit_effect_resizable_flip_context_free);
elm_transit_effect_resizable_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_Y, EINA_TRUE);
}
/* Translation, Rotation, Color, Wipe, ImagemAnimation Effect */

View File

@ -2475,49 +2475,17 @@ extern "C" {
EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode) EINA_ARG_NONNULL(1);
EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_resizing_context_new(Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
EAPI void elm_transit_effect_resizing_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_resizing_context_free(void *data, Elm_Transit *transit);
EAPI void *elm_transit_effect_translation_context_new(Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy);
EAPI void elm_transit_effect_translation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_translation_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_zoom_context_new(float from_rate, float to_rate);
EAPI void elm_transit_effect_zoom_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_zoom_context_free(void *data, Elm_Transit *transit);
EAPI void *elm_transit_effect_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw);
EAPI void elm_transit_effect_flip_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_flip_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1, 2);
EAPI void *elm_transit_effect_resizable_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw);
EAPI void elm_transit_effect_resizable_flip_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1);
EAPI void elm_transit_effect_resizable_flip_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_wipe_context_new(Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir);
EAPI void elm_transit_effect_wipe_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_wipe_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1, 2);
EAPI void *elm_transit_effect_color_context_new(unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
EAPI void elm_transit_effect_color_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_color_context_free(void *data, Elm_Transit *transit);
EAPI void *elm_transit_effect_fade_context_new(void);
EAPI void elm_transit_effect_fade_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1);
EAPI void elm_transit_effect_fade_context_free(void *data, Elm_Transit *tranasit) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_blend_context_new(void);
EAPI void elm_transit_effect_blend_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_blend_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw);
EAPI void elm_transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_rotation_context_free(void *data, Elm_Transit *transit);
EAPI void *elm_transit_effect_image_animation_context_new(Eina_List *images);
EAPI void elm_transit_effect_image_animation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
EAPI void elm_transit_effect_image_animation_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
EAPI void *elm_transit_effect_resizing_add(Elm_Transit* transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
EAPI void *elm_transit_effect_translation_add(Elm_Transit* transit, Evas_Coord from_dx, Evas_Coord dy, Evas_Coord to_dx, Evas_Coord to_dy);
EAPI void *elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate);
EAPI void *elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw);
EAPI void *elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw);
EAPI void *elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir);
EAPI void *elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
EAPI void *elm_transit_effect_fade_add(Elm_Transit *transit);
EAPI void *elm_transit_effect_blend_add(Elm_Transit *transit);
EAPI void *elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw);
EAPI void *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);
typedef struct _Elm_Store Elm_Store;
typedef struct _Elm_Store_Filesystem Elm_Store_Filesystem;

File diff suppressed because it is too large Load Diff