forked from enlightenment/efl
From: ChunEon Park <chuneon.park@samsung.com>
Subject: Re: [E-devel] [PATCH] elm_transit Here is a very small patch for elm_transit Removed an unnecessary parameter. SVN revision: 56016
This commit is contained in:
parent
a9b51873bd
commit
ef41b5aff1
|
@ -81,7 +81,7 @@ _transit_rotation_translation_color(void *data __UNUSED__, Evas_Object *obj, voi
|
|||
elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50);
|
||||
|
||||
/* Rotation Effect */
|
||||
elm_transit_effect_rotation_add(trans, 0.0, 135.0, EINA_FALSE);
|
||||
elm_transit_effect_rotation_add(trans, 0.0, 135.0);
|
||||
|
||||
elm_transit_duration_set(trans, 5.0);
|
||||
elm_transit_go(trans);
|
||||
|
|
|
@ -2501,7 +2501,7 @@ extern "C" {
|
|||
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_rotation_add(Elm_Transit *transit, float from_degree, float to_degree);
|
||||
EAPI void *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);
|
||||
|
||||
typedef struct _Elm_Store Elm_Store;
|
||||
|
|
|
@ -2362,7 +2362,6 @@ typedef struct _Elm_Transit_Effect_Rotation Elm_Transit_Effect_Rotation;
|
|||
|
||||
struct _Elm_Transit_Effect_Rotation
|
||||
{
|
||||
Eina_Bool cw;
|
||||
float from, to;
|
||||
};
|
||||
|
||||
|
@ -2395,8 +2394,6 @@ _transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress)
|
|||
evas_map_util_points_populate_from_object_full(map, obj, 0);
|
||||
degree = rotation->from + (float)(progress * rotation->to);
|
||||
|
||||
if (!rotation->cw) degree *= -1;
|
||||
|
||||
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
||||
|
||||
half_w = (float)w * 0.5;
|
||||
|
@ -2411,7 +2408,7 @@ _transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress)
|
|||
}
|
||||
|
||||
static void *
|
||||
_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw)
|
||||
_transit_effect_rotation_context_new(float from_degree, float to_degree)
|
||||
{
|
||||
Elm_Transit_Effect_Rotation *rotation;
|
||||
|
||||
|
@ -2420,7 +2417,6 @@ _transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bo
|
|||
|
||||
rotation->from = from_degree;
|
||||
rotation->to = to_degree - from_degree;
|
||||
rotation->cw = cw;
|
||||
|
||||
return rotation;
|
||||
}
|
||||
|
@ -2440,7 +2436,6 @@ _transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bo
|
|||
* @param transit Transit object.
|
||||
* @param from_degree Degree when effect begins.
|
||||
* @param to_degree Degree when effect is ends.
|
||||
* @param cw Rotation direction. EINA_TRUE is clock wise.
|
||||
* @return Rotation effect context data.
|
||||
*
|
||||
* @ingroup Transit
|
||||
|
@ -2452,10 +2447,10 @@ _transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bo
|
|||
* to run, because the order of the objects will be affected.
|
||||
*/
|
||||
EAPI void *
|
||||
elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw)
|
||||
elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree)
|
||||
{
|
||||
ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
|
||||
void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree, cw);
|
||||
void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree);
|
||||
|
||||
if (!effect_context) return NULL;
|
||||
elm_transit_effect_add(transit,
|
||||
|
|
Loading…
Reference in New Issue