forked from e16/e16
1
0
Fork 0

Fix pager drags to/from nested E.

SVN revision: 14976
This commit is contained in:
Kim Woelders 2005-05-28 06:23:51 +00:00
parent 39a7a88b22
commit d41aa06aba
3 changed files with 6 additions and 3 deletions

View File

@ -266,6 +266,9 @@ main(int argc, char **argv)
ExtInitWinKill();
#endif
if (Mode.wm.window)
EMapWindow(VRoot.win);
/* sync just to make sure */
ESync();

View File

@ -1042,7 +1042,7 @@ PagerHiwinShow(Pager * p, EWin * ewin, int px, int py)
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 @@ PagerHiwinEvent(XEvent * ev, void *prm)
#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;

View File

@ -232,8 +232,6 @@ SetupX(const char *dstr)
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);