enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Bad xcomp, nice patch, but it broke resize - here mend resize so all is happy 

SVN revision: 12893
This commit is contained in:
handyande 2005-01-11 09:35:02 +00:00 committed by handyande
parent 0b7f7e5a18
commit 9a555d6d96
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/pager/e_mod_main.c
View File

@ -246,6 +246,8 @@ static void
_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 @@ _pager_reconfigure(Pager *e)
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 @@ _pager_cb_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
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;

2
src/modules/pager/e_mod_main.h
View File

@ -23,7 +23,7 @@ struct _Pager
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 */