Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Bad xcomp, nice patch, but it broke resize - here mend resize so all is happy
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h 10 Jan 2005 18:59:04 -0000 1.3
+++ e_mod_main.h 11 Jan 2005 09:35:02 -0000 1.4
@@ -23,7 +23,7 @@
unsigned char move : 1;
unsigned char resize : 1;
Ecore_Event_Handler *ev_handler_container_resize;
- Evas_Coord fx, fy, fw, fh;
+ Evas_Coord fx, fy, fw, fh, tw, th;
Evas_Coord xx, yy;
/* FIXME: want to fix click detection once leftdrag is not used */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 11 Jan 2005 08:13:36 -0000 1.12
+++ e_mod_main.c 11 Jan 2005 09:35:02 -0000 1.13
@@ -246,6 +246,8 @@
_pager_reconfigure(Pager *e)
{
Evas_Coord ww, hh;
+ E_Zone *zone;
+ int xcount, ycount;
evas_output_viewport_get(e->evas, NULL, NULL, &ww, &hh);
e->fx = e->conf->x * (ww - e->conf->width);
@@ -253,6 +255,11 @@
e->fw = e->conf->width;
e->fh = e->conf->height;
+ zone = e_zone_current_get(e->con);
+ e_zone_desk_count_get(zone, &xcount, &ycount);
+ e->tw = e->fw * xcount;
+ e->th = e->fh * ycount;
+
_pager_refresh(e);
}
@@ -481,12 +488,18 @@
else if (p->resize)
{
Evas_Coord dx, dy;
+ E_Zone *zone;
+ int xcount, ycount;
+ zone = e_zone_current_get(p->con);
+ e_zone_desk_count_get(zone, &xcount, &ycount);
dx = cx - p->xx;
dy = cy - p->yy;
- p->fw += dx;
- p->fh += dy;
+ p->tw += dx;
+ p->th += dy;
+ p->fw = p->tw / xcount;
+ p->fh = p->th / ycount;
if (p->fw < PAGER_MIN_W) p->fw = PAGER_MIN_W;
if (p->fh < PAGER_MIN_H) p->fh = PAGER_MIN_H;
// if (p->fw < p->minsize) p->fw = p->minsize;
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
