Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_gadman.c e_manager.c
Log Message:
fix a bunch of fixme's in the todo for mini freeze found recently
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- e_border.c 31 Mar 2005 15:38:24 -0000 1.124
+++ e_border.c 5 Apr 2005 14:47:39 -0000 1.125
@@ -349,13 +349,13 @@
if (bd->desk->zone != bd->zone)
{
E_Desk *desk;
- int x, y;
+// int x, y;
- e_desk_xy_get(bd->desk, &x, &y);
- desk = e_desk_at_xy_get(bd->zone, x, y);
- if (desk)
- e_border_desk_set(bd, desk);
- else
+// e_desk_xy_get(bd->desk, &x, &y);
+// desk = e_desk_at_xy_get(bd->zone, x, y);
+// if (desk)
+// e_border_desk_set(bd, desk);
+// else
e_border_desk_set(bd, e_desk_current_get(bd->zone));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_gadman.c 5 Apr 2005 03:13:08 -0000 1.27
+++ e_gadman.c 5 Apr 2005 14:47:41 -0000 1.28
@@ -920,11 +920,11 @@
_e_gadman_client_geometry_to_align(E_Gadman_Client *gmc)
{
if (gmc->w != gmc->zone->w)
- gmc->ax = (double)gmc->x / (double)(gmc->zone->w - gmc->w);
+ gmc->ax = (double)(gmc->x - gmc->zone->x) / (double)(gmc->zone->w -
gmc->w);
else
gmc->ax = 0.0;
if (gmc->h != gmc->zone->h)
- gmc->ay = (double)gmc->y / (double)(gmc->zone->h - gmc->h);
+ gmc->ay = (double)(gmc->y - gmc->zone->y) / (double)(gmc->zone->h -
gmc->h);
else
gmc->ay = 0.0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_manager.c 21 Mar 2005 12:47:11 -0000 1.17
+++ e_manager.c 5 Apr 2005 14:47:46 -0000 1.18
@@ -133,7 +133,9 @@
con = e_manager_container_number_get(man, id);
else
con = e_manager_container_current_get(man);
-
+ if (!con)
+ e_container_current_get(man);
+
ret = ecore_x_window_prop_card32_get(windows[i],
E_ATOM_ZONE,
&id, 1);
@@ -141,7 +143,8 @@
zone = e_container_zone_number_get(con, id);
else
zone = e_zone_current_get(con);
-
+ if (!zone)
+ zone = e_zone_current_get(con);
ret = ecore_x_window_prop_card32_get(windows[i],
E_ATOM_DESK,
deskxy, 2);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
