Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c slideout.c
Log Message:
Fix slideouts.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- eobj.c 24 Jul 2005 15:26:35 -0000 1.41
+++ eobj.c 2 Aug 2005 17:06:52 -0000 1.42
@@ -280,7 +280,7 @@
if (raise)
EobjListStackRaise(eo);
- if (eo->stacked <= 0)
+ if (eo->stacked <= 0 || raise > 1)
{
if (eo->stacked < 0)
DeskSetDirtyStack(eo->desk);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- slideout.c 16 Jul 2005 16:57:44 -0000 1.36
+++ slideout.c 2 Aug 2005 17:06:52 -0000 1.37
@@ -150,10 +150,12 @@
xx -= EoGetX(d);
yy -= EoGetY(d);
}
+ EoSetLayer(s, EoGetLayer(ewin));
}
else
{
d = DeskGet(0);
+ EoSetLayer(s, 10);
}
EoReparent(s, EoObj(d), xx, yy);
@@ -166,9 +168,9 @@
for (i = 0; i < s->num_buttons; i++)
EChangeWindowAttributes(ButtonGetWin(s->button[i]),
CWWinGravity, &att);
- EobjMoveResize(EoObj(s), xx, yy, 1, 1);
+ EoMoveResize(s, xx, yy, 1, 1);
ESync();
- EobjMap(EoObj(s), 1);
+ EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx + sw, yy, xx, yy, 1, sh, sw, sh,
Conf.slidespeedmap);
break;
@@ -179,9 +181,9 @@
for (i = 0; i < s->num_buttons; i++)
EChangeWindowAttributes(ButtonGetWin(s->button[i]),
CWWinGravity, &att);
- EobjMoveResize(EoObj(s), xx, yy, 1, 1);
+ EoMoveResize(s, xx, yy, 1, 1);
ESync();
- EobjMap(EoObj(s), 1);
+ EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy, xx, yy, 1, sh, sw, sh,
Conf.slidespeedmap);
break;
@@ -192,9 +194,9 @@
for (i = 0; i < s->num_buttons; i++)
EChangeWindowAttributes(ButtonGetWin(s->button[i]),
CWWinGravity, &att);
- EobjMoveResize(EoObj(s), xx, yy, 1, 1);
+ EoMoveResize(s, xx, yy, 1, 1);
ESync();
- EobjMap(EoObj(s), 1);
+ EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy + sh, xx, yy, sw, 1, sw, sh,
Conf.slidespeedmap);
break;
@@ -205,9 +207,9 @@
for (i = 0; i < s->num_buttons; i++)
EChangeWindowAttributes(ButtonGetWin(s->button[i]),
CWWinGravity, &att);
- EobjMoveResize(EoObj(s), xx, yy, 1, 1);
+ EoMoveResize(s, xx, yy, 1, 1);
ESync();
- EobjMap(EoObj(s), 1);
+ EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy, xx, yy, sw, 1, sw, sh,
Conf.slidespeedmap);
break;
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
