}
static Eina_List *
-_rotation_effect_targets_get(Rotation_Effect *effect, E_Desk *desk)
+_rotation_effect_targets_get(Rotation_Effect *effect)
{
Evas_Object *o;
Eina_Tiler *t;
ec = evas_object_data_get(o, "E_Client");
if (ec)
{
- if (ec->desk != desk) continue;
if (e_object_is_del(E_OBJECT(ec))) continue;
if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
continue;
}
static Rotation_Effect_Begin_Context *
-_rotation_effect_begin_create(Rotation_Effect *effect, Eina_List *targets, E_Desk *desk)
+_rotation_effect_begin_create(Rotation_Effect *effect, Eina_List *targets)
{
Rotation_Effect_Begin_Context *ctx_begin = NULL;
Rotation_Effect_Object *eobj = NULL;
return NULL;
}
- e_desk_smart_member_add(desk, ctx_begin->layout);
-
EFFINF("Rotation Begin Created", NULL, NULL);
int diff = effect->zone->rot.prev - effect->zone->rot.curr;
static Rotation_Effect_End_Context *
-_rotation_effect_end_create(Rotation_Effect *effect, Eina_List *targets, E_Desk *desk)
+_rotation_effect_end_create(Rotation_Effect *effect, Eina_List *targets)
{
Rotation_Effect_End_Context *ctx_end = NULL;
Rotation_Effect_Object *eobj = NULL;
return NULL;
}
- e_desk_smart_member_add(desk, ctx_end->layout);
-
EFFINF("Rotation End Created", NULL, NULL);
int diff = _rotation_zone->curr_angle - _rotation_zone->prev_angle;
}
static void
-_rotation_effect_animator_begin_prepare(Rotation_Effect *effect, E_Desk *desk)
+_rotation_effect_animator_begin_prepare(Rotation_Effect *effect)
{
if (!effect) return;
_rotation_effect_clear(effect);
- effect->targets = _rotation_effect_targets_get(effect, desk);
+ effect->targets = _rotation_effect_targets_get(effect);
if (!effect->targets) return;
- effect->ctx_begin = _rotation_effect_begin_create(effect, effect->targets, desk);
+ effect->ctx_begin = _rotation_effect_begin_create(effect, effect->targets);
if (!effect->ctx_begin)
{
_rotation_effect_clear(effect);
}
static void
-_rotation_effect_animator_end_prepare(Rotation_Effect *effect, E_Desk *desk)
+_rotation_effect_animator_end_prepare(Rotation_Effect *effect)
{
if (!effect) return;
if (!effect->targets) return;
_rotation_effect_animator_end_context_free(effect->ctx_end);
effect->ctx_end = NULL;
- effect->ctx_end = _rotation_effect_end_create(effect, effect->targets, desk);
+ effect->ctx_end = _rotation_effect_end_create(effect, effect->targets);
if (!effect->ctx_end) return;
EFFINF("Rotation End Prepared", NULL, NULL);
Rotation_Effect *effect;
E_Event_Zone_Rotation_Change_Begin *ev = event;
E_Zone *zone;
- E_Desk *desk;
effect = (Rotation_Effect *)data;
if (!effect) return ECORE_CALLBACK_PASS_ON;
_rotation_zone->curr_angle = zone->rot.curr;
_rotation_zone->prev_angle = zone->rot.prev;
- desk = e_desk_current_get(zone);
- _rotation_effect_animator_begin_prepare(effect, desk);
+ _rotation_effect_animator_begin_prepare(effect);
if (effect->targets)
_rotation_effect_ready_send(zone);
Rotation_Effect *effect;
E_Event_Zone_Rotation_Change_End *ev = event;
E_Zone *zone;
- E_Desk *desk;
effect = (Rotation_Effect *)data;
if (!effect) return ECORE_CALLBACK_PASS_ON;
if (!effect->ctx_end)
{
- desk = e_desk_current_get(zone);
- _rotation_effect_animator_end_prepare(effect, desk);
+ _rotation_effect_animator_end_prepare(effect);
if (!effect->ctx_end)
_rotation_effect_clear(effect);
{
E_Event_Client *ev = event;
E_Client *ec;
- E_Desk *desk;
Rotation_Effect *effect;
ec = ev->ec;
if (!effect->wait_for_buffer) return ECORE_CALLBACK_PASS_ON;
- if (!effect->ctx_end)
- {
- desk = e_desk_current_get(ec->zone);
- _rotation_effect_animator_end_prepare(effect, desk);
- }
+ if (!effect->ctx_end) _rotation_effect_animator_end_prepare(effect);
if (effect->ctx_end) _rotation_effect_start(effect);
return ECORE_CALLBACK_PASS_ON;