Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
arrange.c dock.c ewins.c
Log Message:
More geometry cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/arrange.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- arrange.c 19 Mar 2005 16:39:58 -0000 1.74
+++ arrange.c 28 Apr 2005 22:01:52 -0000 1.75
@@ -789,17 +789,21 @@
void
ArrangeEwin(EWin * ewin)
{
+ int x, y;
+
ewin->client.already_placed = 1;
- ArrangeEwinXY(ewin, &EoGetX(ewin), &EoGetY(ewin));
- MoveEwin(ewin, EoGetX(ewin), EoGetY(ewin));
+ ArrangeEwinXY(ewin, &x, &y);
+ MoveEwin(ewin, x, y);
}
void
ArrangeEwinCentered(EWin * ewin, int focus)
{
+ int x, y;
+
ewin->client.already_placed = 1;
- ArrangeEwinCenteredXY(ewin, &EoGetX(ewin), &EoGetY(ewin));
- MoveEwin(ewin, EoGetX(ewin), EoGetY(ewin));
+ ArrangeEwinCenteredXY(ewin, &x, &y);
+ MoveEwin(ewin, x, y);
if (focus)
FocusToEWin(ewin, FOCUS_SET);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dock.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- dock.c 19 Mar 2005 16:40:01 -0000 1.23
+++ dock.c 28 Apr 2005 22:01:53 -0000 1.24
@@ -118,8 +118,7 @@
y = VRoot.h - h / 2;
}
- EoSetX(eapp, x);
- EoSetY(eapp, y);
+ EoMove(eapp, x, y);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewins.c 25 Apr 2005 16:02:52 -0000 1.47
+++ ewins.c 28 Apr 2005 22:01:53 -0000 1.48
@@ -472,20 +472,22 @@
static void
EwinGetGeometry(EWin * ewin)
{
- int x, y;
+ int x, y, l, r, t, b;
EwinGetPosition(ewin, &x, &y);
- ewin->client.x = x + ewin->border->border.left;
- ewin->client.y = y + ewin->border->border.top;
+ l = ewin->border->border.left;
+ r = ewin->border->border.right;
+ t = ewin->border->border.top;
+ b = ewin->border->border.bottom;
+
+ ewin->client.x = x + l;
+ ewin->client.y = y + t;
- EoSetX(ewin, ewin->shape_x = x);
- EoSetY(ewin, ewin->shape_y = y);
+ ewin->shape_x = x;
+ ewin->shape_y = y;
- EoSetW(ewin, ewin->client.w +
- ewin->border->border.left + ewin->border->border.right);
- EoSetH(ewin, ewin->client.h +
- ewin->border->border.top + ewin->border->border.bottom);
+ EoMoveResize(ewin, x, y, ewin->client.w + l + r, ewin->client.h + t + b);
}
void
@@ -789,8 +791,8 @@
newWinY = MAX(newWinY, 0);
/* this works for me... */
- EoSetX(ewin, x = newWinX);
- EoSetY(ewin, y = newWinY);
+ x = newWinX;
+ y = newWinY;
}
else
{
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
