Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_place.h e_place.c
Log Message:
Don't use place func, we need the cursor pos.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -3 -r1.420 -r1.421
--- e_border.c 26 Sep 2005 10:07:48 -0000 1.420
+++ e_border.c 26 Sep 2005 10:30:38 -0000 1.421
@@ -4938,7 +4938,7 @@
}
else if (e_config->window_placement_policy ==
E_WINDOW_PLACEMENT_MANUAL)
{
- e_place_zone_manual(bd->zone, bd->x, bd->w,
bd->client_inset.t,
+ e_place_zone_manual(bd->zone, bd->w,
bd->client_inset.t,
&new_x, &new_y);
}
else
@@ -5333,8 +5333,9 @@
bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
{
- e_place_zone_manual(bd->zone, bd->x, bd->w,
- bd->client_inset.t, &bd->x, &bd->y);
+ ecore_x_pointer_xy_get(bd->zone->container->win, &x, &y);
+ bd->x = x - (bd->w >> 1);
+ bd->y = y - (bd->client_inset.t >> 1);
bd->moveinfo.down.x = bd->x;
bd->moveinfo.down.y = bd->y;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_place.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_place.h 22 Sep 2005 17:10:02 -0000 1.9
+++ e_place.h 26 Sep 2005 10:30:38 -0000 1.10
@@ -9,7 +9,7 @@
EAPI void e_place_zone_region_smart_cleanup(E_Zone *zone);
EAPI int e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x,
int y, int w, int h, int *rx, int *ry);
EAPI int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it,
int *rx, int *ry);
-EAPI int e_place_zone_manual(E_Zone *zone, int x, int w, int it, int *rx, int
*ry);
+EAPI int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_place.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_place.c 22 Sep 2005 17:10:02 -0000 1.12
+++ e_place.c 26 Sep 2005 10:30:38 -0000 1.13
@@ -481,15 +481,15 @@
}
int
-e_place_zone_manual(E_Zone *zone, int x, int w, int it, int *rx, int *ry)
+e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry)
{
int cursor_x = 0, cursor_y = 0;
E_OBJECT_CHECK_RETURN(zone, 0);
ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
- *rx = cursor_x - ((w - x) >> 1);
- *ry = cursor_y - (it >> 1);
+ *rx = cursor_x - (w >> 1);
+ *ry = cursor_y - (h >> 1);
return 1;
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
