update to latest api changes
This commit is contained in:
parent
95b961304e
commit
e1ae86f80a
|
@ -19,7 +19,7 @@ _ds_end(void *data EINA_UNUSED, Efx_Map_Data *emd EINA_UNUSED, Evas_Object *obj
|
|||
if (desk_show)
|
||||
{
|
||||
e_desk_flip_end(desk_show);
|
||||
e_comp_shape_queue_block(e_comp, 0);
|
||||
e_comp_shape_queue_block(0);
|
||||
}
|
||||
|
||||
/* hide/delete current desk's mirror */
|
||||
|
@ -69,7 +69,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
|
|||
E_FREE_FUNC(dm_show, evas_object_del);
|
||||
|
||||
/* iterate all clients */
|
||||
E_CLIENT_FOREACH(desk->zone->comp, ec)
|
||||
E_CLIENT_FOREACH(ec)
|
||||
{
|
||||
/* skip clients from other screens, iconic clients, and ignorable clients */
|
||||
if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue;
|
||||
|
@ -96,7 +96,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
|
|||
}
|
||||
desk_show = desk;
|
||||
|
||||
e_comp_shape_queue_block(e_comp, 1);
|
||||
e_comp_shape_queue_block(1);
|
||||
/* guarantee that the user gets to see each flip
|
||||
* at least once
|
||||
*/
|
||||
|
@ -394,7 +394,7 @@ _ds_hide(E_Desk *desk)
|
|||
E_Client *ec;
|
||||
|
||||
E_FREE_FUNC(dm_hide, evas_object_del);
|
||||
E_CLIENT_FOREACH(desk->zone->comp, ec)
|
||||
E_CLIENT_FOREACH(ec)
|
||||
{
|
||||
/* same as above */
|
||||
if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue;
|
||||
|
|
|
@ -120,14 +120,14 @@ e_modapi_save(E_Module *m EINA_UNUSED)
|
|||
}
|
||||
|
||||
EINTERN void
|
||||
ds_fade_setup(E_Comp *comp, Evas_Object_Event_Cb click_cb)
|
||||
ds_fade_setup(Evas_Object_Event_Cb click_cb)
|
||||
{
|
||||
if (fade_obj) return;
|
||||
fade_obj = evas_object_rectangle_add(comp->evas);
|
||||
fade_obj = evas_object_rectangle_add(e_comp->evas);
|
||||
if (click_cb)
|
||||
evas_object_event_callback_add(fade_obj, EVAS_CALLBACK_MOUSE_DOWN, click_cb, NULL);
|
||||
evas_object_name_set(fade_obj, "fade_obj");
|
||||
evas_object_geometry_set(fade_obj, 0, 0, comp->man->w, comp->man->h);
|
||||
evas_object_geometry_set(fade_obj, 0, 0, e_comp->man->w, e_comp->man->h);
|
||||
evas_object_layer_set(fade_obj, E_LAYER_MENU + 1);
|
||||
evas_object_show(fade_obj);
|
||||
efx_fade(fade_obj, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL);
|
||||
|
|
|
@ -83,7 +83,7 @@ typedef struct Config
|
|||
extern Mod *mod;
|
||||
extern Config *ds_config;
|
||||
|
||||
EINTERN void ds_fade_setup(E_Comp *comp, Evas_Object_Event_Cb click_cb);
|
||||
EINTERN void ds_fade_setup(Evas_Object_Event_Cb click_cb);
|
||||
EINTERN void ds_fade_end(Ecore_Cb cb, Evas_Object_Event_Cb click_cb);
|
||||
|
||||
EINTERN void ds_init(void);
|
||||
|
|
|
@ -15,11 +15,9 @@ static void
|
|||
_magnify_end(void)
|
||||
{
|
||||
unsigned int n;
|
||||
E_Comp *comp;
|
||||
|
||||
if (!magnifiers) return;
|
||||
comp = e_comp;
|
||||
for (n = 0; n < eina_list_count(comp->zones); n++)
|
||||
for (n = 0; n < eina_list_count(e_comp->zones); n++)
|
||||
E_FREE_FUNC(magnifiers[n], evas_object_del);
|
||||
E_FREE(magnifiers);
|
||||
E_FREE_FUNC(clip, evas_object_del);
|
||||
|
@ -42,7 +40,7 @@ _magnify_update(int x, int y)
|
|||
int w, h;
|
||||
E_Zone *zone;
|
||||
|
||||
zone = e_comp_zone_xy_get(e_comp, x, y);
|
||||
zone = e_comp_zone_xy_get(x, y);
|
||||
if ((int)zone->num != current_mag)
|
||||
_current_update(zone->num);
|
||||
|
||||
|
@ -55,7 +53,7 @@ _magnify_update(int x, int y)
|
|||
static Eina_Bool
|
||||
_magnify_move(void *data EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Mouse_Move *ev)
|
||||
{
|
||||
_magnify_update(e_comp_canvas_x_root_adjust(e_comp, ev->root.x), e_comp_canvas_y_root_adjust(e_comp, ev->root.y));
|
||||
_magnify_update(e_comp_canvas_x_root_adjust(ev->root.x), e_comp_canvas_y_root_adjust(ev->root.y));
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
@ -87,37 +85,35 @@ _magnify_new(E_Desk *desk)
|
|||
static void
|
||||
_magnify_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
|
||||
{
|
||||
E_Comp *comp;
|
||||
E_Zone *zone;
|
||||
unsigned int n;
|
||||
int x, y, w, h;
|
||||
Eina_List *l;
|
||||
|
||||
comp = e_comp;
|
||||
if (magnifiers)
|
||||
{
|
||||
_magnify_end();
|
||||
return;
|
||||
}
|
||||
|
||||
clip = evas_object_rectangle_add(comp->evas);
|
||||
clip = evas_object_rectangle_add(e_comp->evas);
|
||||
evas_object_show(clip);
|
||||
ecore_evas_pointer_xy_get(comp->ee, &x, &y);
|
||||
magnifiers = malloc(sizeof(void*) * eina_list_count(comp->zones));
|
||||
for (n = 0, l = comp->zones, zone = eina_list_data_get(l);
|
||||
n < eina_list_count(comp->zones);
|
||||
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
|
||||
magnifiers = malloc(sizeof(void*) * eina_list_count(e_comp->zones));
|
||||
for (n = 0, l = e_comp->zones, zone = eina_list_data_get(l);
|
||||
n < eina_list_count(e_comp->zones);
|
||||
n++, l = eina_list_next(l), zone = eina_list_data_get(l))
|
||||
{
|
||||
_magnify_new(e_desk_current_get(zone));
|
||||
|
||||
evas_object_clip_set(magnifiers[n], clip);
|
||||
if (zone != e_zone_current_get(comp)) continue;
|
||||
if (zone != e_zone_current_get()) continue;
|
||||
w = zone->w / MAG_SIZE_FACTOR;
|
||||
h = zone->h / MAG_SIZE_FACTOR;
|
||||
evas_object_geometry_set(clip, x - (w / 2), y - (h / 2), w, h);
|
||||
_current_update(n);
|
||||
}
|
||||
if (comp->comp_type == E_PIXMAP_TYPE_X)
|
||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||
timer = ecore_timer_add(0.05, _magnify_poll, NULL);
|
||||
else
|
||||
handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, (Ecore_Event_Handler_Cb)_magnify_move, NULL);
|
||||
|
|
|
@ -5,7 +5,7 @@ static Ecore_Event_Handler *eh = NULL;
|
|||
static Eina_Bool
|
||||
_ds_unmaximize_render(void *d EINA_UNUSED)
|
||||
{
|
||||
e_comp_render_queue(e_comp);
|
||||
e_comp_render_queue();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
|
@ -121,7 +121,7 @@ maximize_init(void)
|
|||
{
|
||||
E_Client *ec;
|
||||
|
||||
E_CLIENT_FOREACH(e_comp, ec)
|
||||
E_CLIENT_FOREACH(ec)
|
||||
_ds_maximize_check(ec);
|
||||
eh = ecore_event_handler_add(E_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb)_ds_maximize_add, NULL);
|
||||
}
|
||||
|
@ -131,7 +131,7 @@ maximize_shutdown(void)
|
|||
{
|
||||
E_Client *ec;
|
||||
|
||||
E_CLIENT_FOREACH(e_comp, ec)
|
||||
E_CLIENT_FOREACH(ec)
|
||||
{
|
||||
if (e_client_util_ignored_get(ec)) continue;
|
||||
evas_object_smart_callback_del(ec->frame, "maximize_done", _ds_maximize);
|
||||
|
|
|
@ -40,7 +40,7 @@ clear_all(void)
|
|||
static void
|
||||
_fade_end(void *d EINA_UNUSED)
|
||||
{
|
||||
e_comp_shape_queue_block(client->comp, 0);
|
||||
e_comp_shape_queue_block(0);
|
||||
clear_all();
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@ move_x_update(E_Client *ec)
|
|||
int w, h;
|
||||
E_Zone *zone;
|
||||
|
||||
zone = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
|
||||
zone = e_comp_zone_xy_get(ec->x, ec->y);
|
||||
if (!zone) zone = ec->zone;
|
||||
|
||||
if (evas_object_clip_get(mr_line_x) != zone->bg_clip_object)
|
||||
|
@ -77,7 +77,7 @@ move_y_update(E_Client *ec)
|
|||
int w, h;
|
||||
E_Zone *zone;
|
||||
|
||||
zone = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
|
||||
zone = e_comp_zone_xy_get(ec->x, ec->y);
|
||||
if (!zone) zone = ec->zone;
|
||||
|
||||
if (evas_object_clip_get(mr_line_y) != zone->bg_clip_object)
|
||||
|
@ -160,9 +160,9 @@ resize_text_update(E_Client *ec)
|
|||
|
||||
if (resize_rect[0])
|
||||
{
|
||||
zone1 = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
|
||||
zone1 = e_comp_zone_xy_get(ec->x, ec->y);
|
||||
if (!zone1) zone1 = ec->zone;
|
||||
zone2 = e_comp_zone_xy_get(ec->comp, ec->x + ec->w, ec->y);
|
||||
zone2 = e_comp_zone_xy_get(ec->x + ec->w, ec->y);
|
||||
if (!zone2) zone2 = ec->zone;
|
||||
if (zone1 == zone2)
|
||||
x = zone1->w;
|
||||
|
@ -174,9 +174,9 @@ resize_text_update(E_Client *ec)
|
|||
|
||||
if (resize_rect[1])
|
||||
{
|
||||
zone1 = e_comp_zone_xy_get(ec->comp, ec->x + ec->w, ec->y);
|
||||
zone1 = e_comp_zone_xy_get(ec->x + ec->w, ec->y);
|
||||
if (!zone1) zone1 = ec->zone;
|
||||
zone2 = e_comp_zone_xy_get(ec->comp, ec->x + ec->w, ec->y + ec->h);
|
||||
zone2 = e_comp_zone_xy_get(ec->x + ec->w, ec->y + ec->h);
|
||||
if (!zone2) zone2 = ec->zone;
|
||||
if (zone1 == zone2)
|
||||
y = zone1->h;
|
||||
|
@ -188,9 +188,9 @@ resize_text_update(E_Client *ec)
|
|||
|
||||
if (resize_rect[2])
|
||||
{
|
||||
zone1 = e_comp_zone_xy_get(ec->comp, ec->x, ec->y + ec->h);
|
||||
zone1 = e_comp_zone_xy_get(ec->x, ec->y + ec->h);
|
||||
if (!zone1) zone1 = ec->zone;
|
||||
zone2 = e_comp_zone_xy_get(ec->comp, ec->x + ec->w, ec->y + ec->h);
|
||||
zone2 = e_comp_zone_xy_get(ec->x + ec->w, ec->y + ec->h);
|
||||
if (!zone2) zone2 = ec->zone;
|
||||
if (zone1 == zone2)
|
||||
x = zone1->w;
|
||||
|
@ -202,9 +202,9 @@ resize_text_update(E_Client *ec)
|
|||
|
||||
if (resize_rect[3])
|
||||
{
|
||||
zone1 = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
|
||||
zone1 = e_comp_zone_xy_get(ec->x, ec->y);
|
||||
if (!zone1) zone1 = ec->zone;
|
||||
zone2 = e_comp_zone_xy_get(ec->comp, ec->x, ec->y + ec->h);
|
||||
zone2 = e_comp_zone_xy_get(ec->x, ec->y + ec->h);
|
||||
if (!zone2) zone2 = ec->zone;
|
||||
if (zone1 == zone2)
|
||||
y = zone1->h;
|
||||
|
@ -253,20 +253,20 @@ move_start(E_Client *ec)
|
|||
if (!ec->moving) return;
|
||||
clear_all();
|
||||
client = ec;
|
||||
e_comp_shape_queue_block(ec->comp, 1);
|
||||
e_comp_shape_queue_block(1);
|
||||
|
||||
ds_fade_setup(ec->comp, NULL);
|
||||
ds_fade_setup(NULL);
|
||||
|
||||
ec->layer_block = 1;
|
||||
evas_object_layer_set(ec->frame, E_LAYER_MENU + 1);
|
||||
|
||||
mr_line_x = line_add(ec->comp->evas);
|
||||
mr_line_y = line_add(ec->comp->evas);
|
||||
mr_line_x = line_add(e_comp->evas);
|
||||
mr_line_y = line_add(e_comp->evas);
|
||||
|
||||
move_text_x = text_add(ec->comp->evas);
|
||||
move_text_x = text_add(e_comp->evas);
|
||||
move_x_update(ec);
|
||||
|
||||
move_text_y = text_add(ec->comp->evas);
|
||||
move_text_y = text_add(e_comp->evas);
|
||||
move_y_update(ec);
|
||||
|
||||
pulse(NULL, NULL, mr_line_x);
|
||||
|
@ -308,9 +308,9 @@ resize_start(E_Client *ec)
|
|||
if (!e_client_util_resizing_get(ec)) return;
|
||||
clear_all();
|
||||
client = ec;
|
||||
e_comp_shape_queue_block(ec->comp, 1);
|
||||
e_comp_shape_queue_block(1);
|
||||
|
||||
ds_fade_setup(ec->comp, NULL);
|
||||
ds_fade_setup(NULL);
|
||||
|
||||
ec->layer_block = 1;
|
||||
evas_object_layer_set(ec->frame, E_LAYER_MENU + 1);
|
||||
|
@ -318,32 +318,32 @@ resize_start(E_Client *ec)
|
|||
switch (ec->resize_mode)
|
||||
{
|
||||
case E_POINTER_RESIZE_TL:
|
||||
resize_rect[0] = line_add(ec->comp->evas);
|
||||
resize_rect[3] = line_add(ec->comp->evas);
|
||||
resize_rect[0] = line_add(e_comp->evas);
|
||||
resize_rect[3] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_T:
|
||||
resize_rect[0] = line_add(ec->comp->evas);
|
||||
resize_rect[0] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_TR:
|
||||
resize_rect[0] = line_add(ec->comp->evas);
|
||||
resize_rect[1] = line_add(ec->comp->evas);
|
||||
resize_rect[0] = line_add(e_comp->evas);
|
||||
resize_rect[1] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_R:
|
||||
resize_rect[1] = line_add(ec->comp->evas);
|
||||
resize_rect[1] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_BR:
|
||||
resize_rect[1] = line_add(ec->comp->evas);
|
||||
resize_rect[2] = line_add(ec->comp->evas);
|
||||
resize_rect[1] = line_add(e_comp->evas);
|
||||
resize_rect[2] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_B:
|
||||
resize_rect[2] = line_add(ec->comp->evas);
|
||||
resize_rect[2] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_BL:
|
||||
resize_rect[2] = line_add(ec->comp->evas);
|
||||
resize_rect[3] = line_add(ec->comp->evas);
|
||||
resize_rect[2] = line_add(e_comp->evas);
|
||||
resize_rect[3] = line_add(e_comp->evas);
|
||||
break;
|
||||
case E_POINTER_RESIZE_L:
|
||||
resize_rect[3] = line_add(ec->comp->evas);
|
||||
resize_rect[3] = line_add(e_comp->evas);
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
|
@ -351,7 +351,7 @@ resize_start(E_Client *ec)
|
|||
if (resize_rect[x])
|
||||
pulse(NULL, NULL, resize_rect[x]);
|
||||
|
||||
resize_text = text_add(ec->comp->evas);
|
||||
resize_text = text_add(e_comp->evas);
|
||||
resize_text_update(ec);
|
||||
}
|
||||
|
||||
|
|
34
src/pip.c
34
src/pip.c
|
@ -37,7 +37,7 @@ pips_noedit()
|
|||
evas_object_pass_events_set(pip->pip, 1);
|
||||
}
|
||||
eina_iterator_free(it);
|
||||
e_comp_shape_queue(e_comp);
|
||||
e_comp_shape_queue();
|
||||
E_FREE_FUNC(action_handler, ecore_event_handler_del);
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,7 @@ pips_edit(void)
|
|||
|
||||
if (e_comp->nocomp) return;
|
||||
editing = EINA_TRUE;
|
||||
ds_fade_setup(e_comp, pips_noedit);
|
||||
ds_fade_setup(pips_noedit);
|
||||
it = eina_hash_iterator_data_new(pips);
|
||||
EINA_ITERATOR_FOREACH(it, pip)
|
||||
{
|
||||
|
@ -57,7 +57,7 @@ pips_edit(void)
|
|||
evas_object_pass_events_set(pip->pip, 0);
|
||||
}
|
||||
eina_iterator_free(it);
|
||||
e_comp_shape_queue(e_comp);
|
||||
e_comp_shape_queue();
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -79,24 +79,24 @@ _pip_mouse_move(Pip *pip, int t EINA_UNUSED, Ecore_Event_Mouse_Move *ev)
|
|||
if ((pip->resize_mode == E_POINTER_RESIZE_B) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_BL) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_BR))
|
||||
h = MAX(e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - y, 5);
|
||||
h = MAX(e_comp_canvas_y_root_adjust(ev->root.y) - y, 5);
|
||||
else if ((pip->resize_mode == E_POINTER_RESIZE_T) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_TL) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_TR))
|
||||
{
|
||||
h = MAX((y + h) - (e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - pip->down.y), 5);
|
||||
y = e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - pip->down.y;
|
||||
h = MAX((y + h) - (e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y), 5);
|
||||
y = e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y;
|
||||
}
|
||||
if ((pip->resize_mode == E_POINTER_RESIZE_R) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_TR) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_BR))
|
||||
w = MAX(e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - x, 5);
|
||||
w = MAX(e_comp_canvas_x_root_adjust(ev->root.x) - x, 5);
|
||||
else if ((pip->resize_mode == E_POINTER_RESIZE_L) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_TL) ||
|
||||
(pip->resize_mode == E_POINTER_RESIZE_BL))
|
||||
{
|
||||
w = MAX((x + w) - (e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - pip->down.x), 5);
|
||||
x = e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - pip->down.x;
|
||||
w = MAX((x + w) - (e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x), 5);
|
||||
x = e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x;
|
||||
}
|
||||
{
|
||||
E_Client *ec;
|
||||
|
@ -108,7 +108,7 @@ _pip_mouse_move(Pip *pip, int t EINA_UNUSED, Ecore_Event_Mouse_Move *ev)
|
|||
case E_POINTER_RESIZE_TR:
|
||||
case E_POINTER_RESIZE_BR:
|
||||
case E_POINTER_RESIZE_BL:
|
||||
if (abs(e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - pip->down.x) > abs(e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - pip->down.y))
|
||||
if (abs(e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x) > abs(e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y))
|
||||
h = (ec->h * w) / ec->w;
|
||||
else
|
||||
w = (ec->w * h) / ec->h;
|
||||
|
@ -131,22 +131,22 @@ _pip_mouse_move(Pip *pip, int t EINA_UNUSED, Ecore_Event_Mouse_Move *ev)
|
|||
else if (pip->move)
|
||||
{
|
||||
evas_object_move(pip->pip,
|
||||
E_CLAMP(e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - pip->down.x, 0, e_comp->man->w - (w / 2)),
|
||||
E_CLAMP(e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - pip->down.y, 0, e_comp->man->h - (h / 2)));
|
||||
E_CLAMP(e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x, 0, e_comp->man->w - (w / 2)),
|
||||
E_CLAMP(e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y, 0, e_comp->man->h - (h / 2)));
|
||||
}
|
||||
else if (pip->crop)
|
||||
{
|
||||
int cx, cy;
|
||||
|
||||
if (x + pip->down.x < e_comp_canvas_x_root_adjust(e_comp, ev->root.x))
|
||||
if (x + pip->down.x < e_comp_canvas_x_root_adjust(ev->root.x))
|
||||
cx = x + pip->down.x;
|
||||
else
|
||||
cx = e_comp_canvas_x_root_adjust(e_comp, ev->root.x);
|
||||
if (y + pip->down.y < e_comp_canvas_y_root_adjust(e_comp, ev->root.y))
|
||||
cx = e_comp_canvas_x_root_adjust(ev->root.x);
|
||||
if (y + pip->down.y < e_comp_canvas_y_root_adjust(ev->root.y))
|
||||
cy = y + pip->down.y;
|
||||
else
|
||||
cy = e_comp_canvas_y_root_adjust(e_comp, ev->root.y);
|
||||
evas_object_geometry_set(pip->clip, cx, cy, abs(cx - e_comp_canvas_x_root_adjust(e_comp, ev->root.x)), abs(cy - e_comp_canvas_y_root_adjust(e_comp, ev->root.y)));
|
||||
cy = e_comp_canvas_y_root_adjust(ev->root.y);
|
||||
evas_object_geometry_set(pip->clip, cx, cy, abs(cx - e_comp_canvas_x_root_adjust(ev->root.x)), abs(cy - e_comp_canvas_y_root_adjust(ev->root.y)));
|
||||
}
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
|
24
src/zoom.c
24
src/zoom.c
|
@ -57,7 +57,7 @@ _edje_custom_setup(Evas_Object *obj, const E_Client *ec, int x, int y, int w, in
|
|||
static void
|
||||
_hid(void *data EINA_UNUSED, Evas_Object *obj, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
|
||||
{
|
||||
e_comp_shape_queue(e_comp);
|
||||
e_comp_shape_queue();
|
||||
evas_object_hide(obj);
|
||||
evas_object_del(obj);
|
||||
}
|
||||
|
@ -77,8 +77,8 @@ _zoom_hide(void)
|
|||
EINA_LIST_FREE(zoom_objs, zoom_obj)
|
||||
elm_layout_signal_emit(zoom_obj, "e,state,inactive", "e");
|
||||
E_FREE_LIST(handlers, ecore_event_handler_del);
|
||||
e_comp_ungrab_input(e_comp, 1, 1);
|
||||
e_comp_shape_queue(e_comp);
|
||||
e_comp_ungrab_input(1, 1);
|
||||
e_comp_shape_queue();
|
||||
current = NULL;
|
||||
cur_act = NULL;
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ _client_mouse_up(E_Client *ec, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED
|
|||
_drag_reset();
|
||||
return;
|
||||
}
|
||||
zone = e_comp_zone_xy_get(e_comp, ev->output.x, ev->output.y);
|
||||
zone = e_comp_zone_xy_get(ev->output.x, ev->output.y);
|
||||
desk = e_desk_current_get(zone);
|
||||
ec->hidden = 0;
|
||||
e_client_desk_set(ec, desk);
|
||||
|
@ -160,13 +160,13 @@ _client_mouse_move(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Mouse_Mov
|
|||
EINA_LIST_FOREACH(zoom_objs, l, zoom_obj)
|
||||
{
|
||||
elm_layout_signal_emit(zoom_obj, "e,state,dragging", "e");
|
||||
if (e_comp_object_util_zone_get(zoom_obj) == e_zone_current_get(e_comp))
|
||||
if (e_comp_object_util_zone_get(zoom_obj) == e_zone_current_get())
|
||||
elm_layout_signal_emit(zoom_obj, "e,state,current", "e");
|
||||
}
|
||||
}
|
||||
evas_object_move(dm_drag,
|
||||
e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - (dx - x),
|
||||
e_comp_canvas_y_root_adjust(e_comp, ev->root.y) - (dy - y));
|
||||
e_comp_canvas_x_root_adjust(ev->root.x) - (dx - x),
|
||||
e_comp_canvas_y_root_adjust(ev->root.y) - (dy - y));
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
@ -366,7 +366,7 @@ _zoom_client_add(void *d EINA_UNUSED, int t EINA_UNUSED, E_Event_Client *ev)
|
|||
if (e_client_util_ignored_get(ev->ec)) return ECORE_CALLBACK_RENEW;
|
||||
if (ev->ec->iconic && (!e_config->winlist_list_show_iconified)) return ECORE_CALLBACK_RENEW;
|
||||
if (((cur_act == act_zoom_zone) || (cur_act == act_zoom_desk)) &&
|
||||
(ev->ec->zone != e_zone_current_get(e_comp))) return ECORE_CALLBACK_RENEW;
|
||||
(ev->ec->zone != e_zone_current_get())) return ECORE_CALLBACK_RENEW;
|
||||
if (((cur_act == act_zoom_desk) || (cur_act == act_zoom_desk_all)) &&
|
||||
(!ev->ec->desk->visible)) return ECORE_CALLBACK_RENEW;
|
||||
|
||||
|
@ -469,8 +469,8 @@ zoom(Eina_List *clients, E_Zone *zone)
|
|||
|
||||
if (!zoom_objs)
|
||||
{
|
||||
e_comp_shape_queue(e_comp);
|
||||
e_comp_grab_input(e_comp, 1, 1);
|
||||
e_comp_shape_queue();
|
||||
e_comp_grab_input(1, 1);
|
||||
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_KEY_DOWN, _zoom_key, NULL);
|
||||
E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_PROPERTY, _zoom_client_property, NULL);
|
||||
E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_ADD, _zoom_client_add, NULL);
|
||||
|
@ -575,7 +575,7 @@ _zoom_desk_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
|
|||
{
|
||||
ZOOM_CHECK;
|
||||
cur_act = act_zoom_desk;
|
||||
_zoom_begin(_filter_desk, e_zone_current_get(e_comp));
|
||||
_zoom_begin(_filter_desk, e_zone_current_get());
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -595,7 +595,7 @@ _zoom_zone_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
|
|||
{
|
||||
ZOOM_CHECK;
|
||||
cur_act = act_zoom_zone;
|
||||
_zoom_begin(_filter_zone, e_zone_current_get(e_comp));
|
||||
_zoom_begin(_filter_zone, e_zone_current_get());
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue