}
static void
-_eff_stack_update()
+_eff_stack_update(void)
{
E_Client *ec;
Evas_Object *o;
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;
}
else
{
- E_Effect_Client *efc;
efc = _eff_client_get(ec);
// TODO : it's for transients windows. wish using other check */
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();
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;
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;
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))
if (_eff_client_get(ec))
{
_eff_object_layer_down(ec);
- //e_client_visibility_skip_set(ec, EINA_FALSE);
evas_object_hide(ec->frame);
}
}
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);
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;
}
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);
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;
}
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))
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;
}
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);
}
}
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");
}
}
}
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)
{
_eff_unref(ec);
}
+
e_comp_override_del();
}
}
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;
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);
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;
}
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);
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;
}
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;
}
{
E_Client *ec;
E_Event_Client *ev = event;
- const char* emission = NULL;
+ const char *emission = NULL;
if (!_eff) return ECORE_CALLBACK_PASS_ON;