More geometry cleanups.

SVN revision: 14457
This commit is contained in:
Kim Woelders 2005-04-28 22:01:53 +00:00
parent edf703b4ac
commit 6a7bf21ead
3 changed files with 22 additions and 17 deletions

View File

@ -789,17 +789,21 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
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);
}

View File

@ -118,8 +118,7 @@ DockappFindEmptySpotFor(EWin * eapp)
y = VRoot.h - h / 2;
}
EoSetX(eapp, x);
EoSetY(eapp, y);
EoMove(eapp, x, y);
}
void

View File

@ -472,20 +472,22 @@ EwinGetPosition(const EWin * ewin, int *px, int *py)
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;
EoSetX(ewin, ewin->shape_x = x);
EoSetY(ewin, ewin->shape_y = y);
ewin->client.x = x + l;
ewin->client.y = y + t;
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);
ewin->shape_x = x;
ewin->shape_y = y;
EoMoveResize(ewin, x, y, ewin->client.w + l + r, ewin->client.h + t + b);
}
void
@ -789,8 +791,8 @@ AddToFamily(EWin * ewin, Window win)
newWinY = MAX(newWinY, 0);
/* this works for me... */
EoSetX(ewin, x = newWinX);
EoSetY(ewin, y = newWinY);
x = newWinX;
y = newWinY;
}
else
{