From c545deb81c832ce19a80a9c5b4fe1f1c58e331d4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 13 Mar 2014 12:15:11 -0400 Subject: [PATCH] fix gadman resistance checking for fake/desk shelves --- src/bin/e_resist.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index 677f049ba..4157c4586 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -88,7 +88,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist, } EAPI int -e_resist_gadman_position(E_Comp *c, Eina_List *skiplist __UNUSED__, +e_resist_gadman_position(E_Comp *c EINA_UNUSED, Eina_List *skiplist __UNUSED__, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry) @@ -104,9 +104,10 @@ e_resist_gadman_position(E_Comp *c, Eina_List *skiplist __UNUSED__, return 0; } - EINA_LIST_FOREACH(e_shelf_list(), l, es) + l = e_shelf_list_all(); + EINA_LIST_FREE(l, es) { - if (es->zone->comp == c) + if (e_shelf_desk_visible(es, e_desk_current_get(es->zone))) { OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h, e_config->gadget_resist);