forgot to backport window placement update from yesterday

SVN revision: 83182
This commit is contained in:
Mike Blumenkrantz 2013-01-23 15:09:09 +00:00
parent 9d9907265b
commit 5ab1029c63
1 changed files with 8 additions and 1 deletions

View File

@ -8545,6 +8545,14 @@ _e_border_eval(E_Border *bd)
if (bd->y < zy)
bd->y = zy;
/* ensure we account for windows which already have client_inset;
* fixes lots of wine placement issues
*/
if (bd->x - bd->client_inset.l >= zx)
bd->x -= bd->client_inset.l;
if (bd->y - bd->client_inset.t >= zy)
bd->y -= bd->client_inset.t;
if (bd->x + bd->w > zx + zw)
bd->x = zx + zw - bd->w;
@ -8563,7 +8571,6 @@ _e_border_eval(E_Border *bd)
bd->changes.pos = 1;
bd->placed = 1;
}
_e_border_move_internal(bd, bd->x, bd->y, 1);
}
if (!bd->placed)
{