Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_maximize.c
Log Message:
Fix for shelfs on specified desktops: Do not maximize until a shelf which is
only visible on other desktops.
(http://bugs.enlightenment.org/show_bug.cgi?id=199)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_maximize.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_maximize.c 20 Jul 2007 08:27:59 -0000 1.20
+++ e_maximize.c 30 Sep 2007 23:21:54 -0000 1.21
@@ -133,12 +133,32 @@
for (l = e_shelf_list(); l; l = l->next)
{
E_Shelf *es;
+ Evas_List *ll;
es = l->data;
if (es->cfg->overlap) continue;
if (es->zone != bd->zone) continue;
- OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
- es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
+ 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 == bd->desk->x) && (sd->y == bd->desk->y))
+ {
+ OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
+ es->x + es->zone->x + es->w, es->y +
es->zone->y + es->h);
+ break;
+ }
+ }
+ }
+ else
+ {
+ OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
+ es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
+ }
}
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
