remove ifdef's for compiling out e_dnd support in wayland-only mode
Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
6dff3365e7
commit
8889a0fc1c
|
@ -2934,14 +2934,14 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
|
||||||
|
|
||||||
e_object_ref(E_OBJECT(ec));
|
e_object_ref(E_OBJECT(ec));
|
||||||
e_comp_object_frame_icon_geometry_get(ec->frame, &x, &y, &w, &h);
|
e_comp_object_frame_icon_geometry_get(ec->frame, &x, &y, &w, &h);
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
|
||||||
client_drag = e_drag_new(ec->zone->comp,
|
client_drag = e_drag_new(ec->zone->comp,
|
||||||
output->x, output->y,
|
output->x, output->y,
|
||||||
drag_types, 1, ec, -1,
|
drag_types, 1, ec, -1,
|
||||||
NULL,
|
NULL,
|
||||||
_e_client_cb_drag_finished);
|
_e_client_cb_drag_finished);
|
||||||
e_drag_resize(client_drag, w, h);
|
e_drag_resize(client_drag, w, h);
|
||||||
#endif
|
|
||||||
o = e_client_icon_add(ec, client_drag->evas);
|
o = e_client_icon_add(ec, client_drag->evas);
|
||||||
if (!o)
|
if (!o)
|
||||||
{
|
{
|
||||||
|
@ -2949,12 +2949,11 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
|
||||||
o = evas_object_rectangle_add(client_drag->evas);
|
o = evas_object_rectangle_add(client_drag->evas);
|
||||||
evas_object_color_set(o, 255, 255, 255, 255);
|
evas_object_color_set(o, 255, 255, 255, 255);
|
||||||
}
|
}
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
|
||||||
e_drag_object_set(client_drag, o);
|
e_drag_object_set(client_drag, o);
|
||||||
e_drag_start(client_drag,
|
e_drag_start(client_drag,
|
||||||
output->x + (ec->drag.x - x),
|
output->x + (ec->drag.x - x),
|
||||||
output->y + (ec->drag.y - y));
|
output->y + (ec->drag.y - y));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
ec->drag.start = 0;
|
ec->drag.start = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue