From: Gwanglim Lee Date: Fri, 23 Sep 2016 11:22:39 +0000 (+0900) Subject: corrected indentation. X-Git-Tag: submit/tizen/20160926.083253~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54ad61f935a162fba7d35b29e812ca0935c70622;p=platform%2Fcore%2Fuifw%2Fe-mod-tizen-effect.git corrected indentation. Change-Id: I03ea5bedc1812a8dc4db3cec416df767a54550ac --- diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index 5fd266b..c4613ca 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -284,7 +284,7 @@ _eff_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, Edje_Signa } static void -_eff_stack_update() +_eff_stack_update(void) { E_Client *ec; Evas_Object *o; @@ -350,11 +350,12 @@ _eff_visibility_stack_check(E_Client *ec, Eina_List *stack) return vis; } -static const char* +static const char * _eff_restack_effect_check(E_Client *ec) { - const char* emission = NULL; + const char *emission = NULL; Eina_Bool v1, v2; + E_Effect_Client *efc; if (!evas_object_visible_get(ec->frame)) return NULL; if (ec->new_client) return NULL; @@ -371,7 +372,6 @@ _eff_restack_effect_check(E_Client *ec) } else { - E_Effect_Client *efc; efc = _eff_client_get(ec); // TODO : it's for transients windows. wish using other check */ @@ -398,18 +398,12 @@ _eff_restack_effect_check(E_Client *ec) static void _eff_cb_visible_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client*) data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW); - if (_eff_unref(ec)) - { - if (_eff_client_get(ec)) - { - //e_client_visibility_skip_set(ec, EINA_FALSE); - } - } + _eff_unref(ec); } _eff_stack_update(); @@ -435,7 +429,6 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal) if (!_eff_ref(ec)) return EINA_FALSE; e_comp_override_add(); - //e_client_visibility_skip_set(ec, EINA_TRUE); EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec); ec->extra_animating = EINA_TRUE; @@ -445,13 +438,14 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_SHOW, - _eff_cb_visible_done); + (void *)ec, + E_EFFECT_TYPE_SHOW, + _eff_cb_visible_done); return EINA_TRUE; } _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW); + e_comp_object_effect_start(ec->frame, _eff_cb_visible_done, ec); return EINA_TRUE; @@ -460,9 +454,9 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal) static void _eff_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client*) data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE); if (_eff_unref(ec)) @@ -470,7 +464,6 @@ _eff_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *s if (_eff_client_get(ec)) { _eff_object_layer_down(ec); - //e_client_visibility_skip_set(ec, EINA_FALSE); evas_object_hide(ec->frame); } } @@ -511,10 +504,7 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal) lowered = 1; if (lowered) - { - _eff_object_layer_up(ec); - //e_client_visibility_skip_set(ec, EINA_TRUE); - } + _eff_object_layer_up(ec); _eff_object_setup(ec); e_comp_object_effect_params_set(ec->frame, 0, (int[]){1}, 1); @@ -522,9 +512,9 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_HIDE, - _eff_cb_hidden_done); + (void *)ec, + E_EFFECT_TYPE_HIDE, + _eff_cb_hidden_done); return EINA_TRUE; } @@ -537,9 +527,9 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal) static void _eff_cb_uniconify_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client*) data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW); _eff_unref(ec); @@ -627,9 +617,9 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_SHOW, - _eff_cb_uniconify_done); + (void *)ec, + E_EFFECT_TYPE_SHOW, + _eff_cb_uniconify_done); return EINA_TRUE; } @@ -644,9 +634,9 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal) static void _eff_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client *)data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE); if (_eff_unref(ec)) @@ -698,9 +688,9 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_HIDE, - _eff_cb_iconify_done); + (void *)ec, + E_EFFECT_TYPE_HIDE, + _eff_cb_iconify_done); return EINA_TRUE; } @@ -709,21 +699,19 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal) return EINA_TRUE; } + static void _eff_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client *)data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_SHOW); if (_eff_unref(ec)) { if (_eff_client_get(ec)) - { - _eff_object_layer_down(ec); - //e_client_visibility_skip_set(ec, EINA_FALSE); - } + _eff_object_layer_down(ec); } } @@ -734,18 +722,18 @@ _eff_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const c static void _eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; - if ((ec = (E_Client *)data)) + if (ec) { if (_eff_unref(ec)) { if (_eff_client_get(ec)) { _eff_object_layer_down(ec); - //e_client_visibility_skip_set(ec, EINA_FALSE); e_comp_object_signal_emit(ec->frame, - "e,action,restack,finish", "e"); + "e,action,restack,finish", + "e"); } } } @@ -757,13 +745,12 @@ _eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const c static void _eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const char *src) { - E_Client *ec = NULL; + E_Client *ec = (E_Client *)data; + E_Effect_Client *efc = NULL; - if ((ec = (E_Client *)data)) + if (ec) { _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_HIDE); - - E_Effect_Client *efc = NULL; efc = _eff_client_get(ec); if (efc && efc->reverse_ec) { @@ -782,6 +769,7 @@ _eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const _eff_unref(ec); } + e_comp_override_del(); } @@ -831,6 +819,7 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) } if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE; + if ((!e_util_strcmp(emission, "e,action,restack,show"))) { if (!_eff_ref(ec)) return EINA_FALSE; @@ -841,7 +830,6 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) e_comp_override_add(); _eff_object_layer_up(ec); - //e_client_visibility_skip_set(ec, EINA_TRUE); _eff_object_setup(ec); e_comp_object_effect_params_set(ec->frame, 0, (int[]){2}, 1); @@ -849,9 +837,9 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_SHOW, - _eff_cb_restack_show_done); + (void *)ec, + E_EFFECT_TYPE_SHOW, + _eff_cb_restack_show_done); return EINA_TRUE; } @@ -884,7 +872,6 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) e_comp_override_add(); _eff_object_layer_up(ec); - //e_client_visibility_skip_set(ec, EINA_TRUE); _eff_object_setup(ec); e_comp_object_effect_params_set(ec->frame, 0, (int[]){3}, 1); @@ -892,9 +879,9 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_HIDE, - _eff_cb_restack_hide_done); + (void *)ec, + E_EFFECT_TYPE_HIDE, + _eff_cb_restack_hide_done); return EINA_TRUE; } @@ -913,9 +900,9 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal) if (e_comp->nocomp) { _eff_pending_effect_set(ec, - (void*)ec, - E_EFFECT_TYPE_HIDE, - _eff_cb_restack_finish_done); + (void *)ec, + E_EFFECT_TYPE_HIDE, + _eff_cb_restack_finish_done); return EINA_TRUE; } @@ -999,7 +986,7 @@ _eff_cb_client_restack(void *data, int type, void *event) { E_Client *ec; E_Event_Client *ev = event; - const char* emission = NULL; + const char *emission = NULL; if (!_eff) return ECORE_CALLBACK_PASS_ON;