E CVS: e kwo

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
	menus.c 


Log Message:
Put menus on current desk in stead of floating on root.

===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -3 -r1.258 -r1.259
--- menus.c	28 Aug 2006 22:18:34 -0000	1.258
+++ menus.c	31 Aug 2006 21:33:02 -0000	1.259
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "borders.h"
+#include "desktops.h"
 #include "dialog.h"
 #include "e16-ecore_list.h"
 #include "eimage.h"
@@ -244,9 +245,7 @@
    ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1,
 			    0.0, 65535.0);
 
-   EoSetSticky(ewin, 1);
-   EoSetLayer(ewin, 3);
-   EoSetFloating(ewin, 1);
+   EoSetLayer(ewin, 12);
    ewin->ewmh.opacity = OpacityFromPercent(Conf.opacity.menus);
 }
 
@@ -292,8 +291,8 @@
    mw = m->w;
    mh = m->h;
 
-   wx = Mode.events.x - x - (w / 2);
-   wy = Mode.events.y - y - (h / 2);
+   wx = Mode.events.x - EoGetX(DesksGetCurrent()) - x - (w / 2);
+   wy = Mode.events.y - EoGetY(DesksGetCurrent()) - y - (h / 2);
    if (Conf.menus.onscreen)
      {
 	Border             *b;
@@ -968,8 +967,8 @@
 	if (!eo)
 	   return;
 
-	EobjSetFloating(eo, 1);
-	EobjSetLayer(eo, 2);
+	EobjReparent(eo, EoObj(DesksGetCurrent()), 0, 0);
+	EobjSetLayer(eo, 11);
 	ESelectInput(eo->win, ButtonPressMask | ButtonReleaseMask |
 		     EnterWindowMask | LeaveWindowMask);
 	EventCallbackRegister(eo->win, 0, MenuMaskerHandleEvents, NULL);