Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_resist.c
Log Message:
Fixing http://bugs.enlightenment.org/show_bug.cgi?id=199:
No resistance when moving windows on a desktop where a 'specified desktops
shelf' isn't visible.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_resist.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_resist.c 21 Aug 2006 15:52:58 -0000 1.16
+++ e_resist.c 30 Sep 2007 23:52:24 -0000 1.17
@@ -24,6 +24,7 @@
E_Resist_Rect *r;
E_Border_List *bl;
E_Border *bd;
+ E_Desk *desk;
if (!e_config->use_resist)
{
@@ -85,15 +86,36 @@
}
e_container_border_list_free(bl);
+ desk = e_desk_current_get(e_zone_current_get(con));
for (l = e_shelf_list(); l; l = l->next)
{
E_Shelf *es;
+ Evas_List *ll;
es = l->data;
if (es->zone->container == con)
{
- OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
- e_config->gadget_resist);
+ if (es->cfg->desk_show_mode)
+ {
+ for (ll = es->cfg->desk_list; ll; ll = ll->next)
+ {
+ E_Config_Shelf_Desk *sd;
+
+ sd = ll->data;
+ if (!sd) continue;
+ if ((sd->x == desk->x) && (sd->y == desk->y))
+ {
+ OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
es->w, es->h,
+ e_config->gadget_resist);
+ break;
+ }
+ }
+ }
+ else
+ {
+ OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w,
es->h,
+ e_config->gadget_resist);
+ }
}
}
if (rects)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
