Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
hiwin.c pager.c
Log Message:
Quit pager zoom when leaving screen.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hiwin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- hiwin.c 7 Jan 2006 07:20:58 -0000 1.7
+++ hiwin.c 5 Feb 2006 17:45:24 -0000 1.8
@@ -434,6 +434,8 @@
for (i = i1; i != i2; i += step)
{
+ int on_screen;
+
if (w > h)
{
ww = i;
@@ -449,8 +451,9 @@
EoMoveResize(phi, xx, yy, ww, hh);
pz->draw(phi);
- EQueryPointer(None, &px, &py, NULL, NULL);
- if ((px < x) || (py < y) || (px >= (x + w)) || (py >= (y + h)))
+ on_screen = EQueryPointer(None, &px, &py, NULL, NULL);
+ if (!on_screen ||
+ (px < x) || (py < y) || (px >= (x + w)) || (py >= (y + h)))
{
pz->fini(phi, 0);
HiwinHide(phi);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -3 -r1.191 -r1.192
--- pager.c 26 Jan 2006 19:12:59 -0000 1.191
+++ pager.c 5 Feb 2006 17:45:24 -0000 1.192
@@ -1087,13 +1087,14 @@
PagerHandleMotion(Pager * p, int x, int y)
{
EWin *ewin;
+ int on_screen;
if (!Conf_pagers.enable)
return;
- EQueryPointer(p->win, &x, &y, NULL, NULL);
+ on_screen = EQueryPointer(p->win, &x, &y, NULL, NULL);
- if (x >= 0 && x < p->w && y >= 0 && y < p->h)
+ if (on_screen && x >= 0 && x < p->w && y >= 0 && y < p->h)
ewin = EwinInPagerAt(p, x, y);
else
ewin = NULL;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
