Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
main.c pager.c setup.c
Log Message:
Fix pager drags to/from nested E.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- main.c 14 May 2005 19:40:34 -0000 1.127
+++ main.c 28 May 2005 06:23:51 -0000 1.128
@@ -266,6 +266,9 @@
ExtInitWinKill();
#endif
+ if (Mode.wm.window)
+ EMapWindow(VRoot.win);
+
/* sync just to make sure */
ESync();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- pager.c 26 May 2005 22:38:28 -0000 1.145
+++ pager.c 28 May 2005 06:23:51 -0000 1.146
@@ -1042,7 +1042,7 @@
EoMoveResize(phi, px + wx, py + wy, ww, wh);
ESetWindowBackgroundPixmap(EoGetWin(phi), ewin->mini_pmm.pmap);
EoMap(phi, 0);
- GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, 1);
+ GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, !Mode.wm.window);
phi->ewin = ewin;
phi->p = p;
Mode.mode = MODE_PAGER_DRAG_PENDING;
@@ -1843,6 +1843,8 @@
#endif
break;
case LeaveNotify:
+ if (Mode.mode != MODE_NONE)
+ break;
PagerHandleMotion(p, ev->xany.window, ev->xcrossing.x, ev->xcrossing.y,
PAGER_EVENT_MOUSE_OUT);
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- setup.c 7 May 2005 11:20:00 -0000 1.160
+++ setup.c 28 May 2005 06:23:51 -0000 1.161
@@ -232,8 +232,6 @@
HintsSetWindowName(VRoot.win, "Enlightenment");
HintsSetWindowClass(VRoot.win, "Virtual-Root", "Enlightenment");
- EMapWindow(VRoot.win);
-
/* Enable eesh and edox to pix up the virtual root */
Esnprintf(buf, sizeof(buf), "%#lx", VRoot.win);
Esetenv("ENL_WM_ROOT", buf, 1);
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
