1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00

Revert "Prevent windows from drifting on restart."

This reverts commit 3cd382bccc.

Conflicts:
	src/window.c
This commit is contained in:
Carlos R. Mafra
2012-12-18 18:29:11 +00:00
parent f6f72acbde
commit b02a12b8c1

View File

@@ -1140,7 +1140,11 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y -= wwin->frame->top_width + wwin->frame->bottom_width;
}
{
/* wWindowConfigure() will account for the window border
* when placing so the window would be shifted without
* the adjustment below
*/
if (HAS_BORDER(wwin)) {
WMRect rect;
WArea usableArea;
int head;
@@ -1153,21 +1157,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
head = wGetHeadForRect(scr, rect);
usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
/* wWindowConfigure() will account for the frame
* when placing so the window would be shifted without
* the adjustment below */
if (y >= usableArea.y1 + wwin->frame->top_width)
y -= wwin->frame->top_width;
/* wWindowConfigure() will account for the window border
* when placing so the window would be shifted without
* the adjustment below */
if (HAS_BORDER(wwin)) {
if (x >= usableArea.x1 + FRAME_BORDER_WIDTH)
x -= FRAME_BORDER_WIDTH;
if (y >= usableArea.y1 + FRAME_BORDER_WIDTH)
y -= FRAME_BORDER_WIDTH;
}
if (x >= usableArea.x1 + 2 * FRAME_BORDER_WIDTH)
x -= 2 * FRAME_BORDER_WIDTH;
if (y >= usableArea.y1 + 2 * FRAME_BORDER_WIDTH)
y -= 2 * FRAME_BORDER_WIDTH;
}
/*