Another shape fix.

SVN revision: 14808
This commit is contained in:
Kim Woelders 2005-05-16 15:31:28 +00:00
parent d4b68276b3
commit 0aaba68763
2 changed files with 2 additions and 2 deletions

View File

@ -1198,7 +1198,7 @@ PropagateShapes(Window win)
rects[0].y = 0;
rects[0].width = ww;
rects[0].height = hh;
XShapeCombineRectangles(disp, win, ShapeBounding, 0, 0, rects,
EShapeCombineRectangles(win, ShapeBounding, 0, 0, rects,
1, ShapeIntersect, Unsorted);
Efree(rects);

View File

@ -611,7 +611,7 @@ EShapeCombineRectangles(Window win, int dest, int x, int y,
xid = EXidFind(win);
if (xid)
{
if (n_rects == 1)
if (n_rects == 1 && op == ShapeSet)
{
if ((rect[0].x == 0) && (rect[0].y == 0)
&& (rect[0].width == xid->w) && (rect[0].height == xid->h))