From 954e1a390e73ca13715a33bd2771ce2b8bf444f4 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 21 Mar 2017 20:42:52 +0100 Subject: [PATCH] tiling: update the indicator where the icons are dropped --- src/modules/tiling/e-module-tiling.edj | Bin 13752 -> 15226 bytes src/modules/tiling/e_mod_tiling.c | 49 +++++++++---------------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/modules/tiling/e-module-tiling.edj b/src/modules/tiling/e-module-tiling.edj index cdeeddf1bd9b525b930ec73c4326faa7805b780b..7777c95bbecfe448c51622755f9ebc7f1f2959bf 100644 GIT binary patch literal 15226 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 E0M2s5XaE2J delta 8174 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 diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c index 7c6030fec..77cce3535 100644 --- a/src/modules/tiling/e_mod_tiling.c +++ b/src/modules/tiling/e_mod_tiling.c @@ -31,8 +31,8 @@ typedef struct Client_Extra geom_t expected; struct { - Evas_Object *ic; - Evas_Object *hint; + Eina_Bool drag; + Evas_Object *hint, *ic; Ecore_Event_Handler *move, *up; int x,y; /* start points */ } drag; @@ -793,6 +793,11 @@ _client_remove_no_apply(E_Client *ec) return EINA_FALSE; } + if (extra->drag.drag) + { + _client_drag_terminate(ec); + } + if (!extra->tiled) return EINA_FALSE; @@ -1474,7 +1479,7 @@ _desk_set_hook(void *data EINA_UNUSED, int type EINA_UNUSED, //check the state of the new desk if (desk_should_tile_check(ev->ec->desk)) { - if (extra->drag.ic) + if (extra->drag.drag) { ev->ec->hidden = EINA_TRUE; e_client_comp_hidden_set(ev->ec, EINA_TRUE); @@ -1484,7 +1489,7 @@ _desk_set_hook(void *data EINA_UNUSED, int type EINA_UNUSED, } else { - if (extra->drag.ic) + if (extra->drag.drag) { _client_drag_terminate(ev->ec); extra->floating = EINA_TRUE; @@ -1597,25 +1602,13 @@ E_API E_Module_Api e_modapi = { "Tiling" }; -static void -_center_on_mouse(Evas_Object *obj) -{ - Evas *e; - int x,y,w,h; - - e = evas_object_evas_get(obj); - evas_pointer_canvas_xy_get(e, &x, &y); - evas_object_geometry_get(obj, NULL, NULL, &w, &h); - evas_object_move(obj, x-w/2, y-h/2); -} - static unsigned char _client_drag_mouse_up(void *data, int event EINA_UNUSED, void *event_info EINA_UNUSED) { E_Client *ec = data; Client_Extra *extra = tiling_entry_func(ec); - if (!evas_object_visible_get(ec->frame)) + if (extra->drag.drag) _client_drag_terminate(data); //remove the events @@ -1646,17 +1639,10 @@ _client_drag_mouse_move(void *data, int event EINA_UNUSED, void *event_info) if (extra->drag.x == ev->x && extra->drag.y == ev->y) return ECORE_CALLBACK_PASS_ON; _client_remove_no_apply(ec); + + extra->drag.drag = EINA_TRUE; e_comp_grab_input(EINA_TRUE, EINA_FALSE); - //create the drag object - extra->drag.ic = e_client_icon_add(ec, evas_object_evas_get(e_comp->elm)); - evas_object_resize(extra->drag.ic, 40, 40); - evas_object_show(extra->drag.ic); - evas_object_layer_set(extra->drag.ic, E_LAYER_CLIENT_DRAG); - - //center the drag object on the mouse - _center_on_mouse(extra->drag.ic); - ec->hidden = EINA_TRUE; e_client_comp_hidden_set(ec, EINA_TRUE); evas_object_hide(ec->frame); @@ -1664,9 +1650,6 @@ _client_drag_mouse_move(void *data, int event EINA_UNUSED, void *event_info) _reapply_tree(); } - //move the drag object to the center of the object - _center_on_mouse(extra->drag.ic); - //now check if we can hint somehow evas_pointer_canvas_xy_get(e_comp->evas, &x, &y); client = _tilable_client(x, y); @@ -1688,6 +1671,10 @@ _client_drag_mouse_move(void *data, int event EINA_UNUSED, void *event_info) edje_object_file_set(extra->drag.hint, _G.edj_path, "modules/tiling/indicator"); evas_object_layer_set(extra->drag.hint, E_LAYER_CLIENT_DRAG); evas_object_show(extra->drag.hint); + + extra->drag.ic = e_client_icon_add(ec, evas_object_evas_get(e_comp->evas)); + edje_object_part_swallow(extra->drag.hint, "e.client.icon", extra->drag.ic); + evas_object_show(extra->drag.ic); } //set the geometry on the hint object @@ -1727,8 +1714,6 @@ _client_drag_terminate(E_Client *ec) //remove the hint object E_FREE_FUNC(extra->drag.hint, evas_object_del); - - //delete the icon on the screen E_FREE_FUNC(extra->drag.ic, evas_object_del); //bring up the client again @@ -1743,6 +1728,8 @@ _client_drag_terminate(E_Client *ec) _reapply_tree(); evas_object_focus_set(ec->frame, EINA_TRUE); + + extra->drag.drag = EINA_FALSE; } static void