mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 04:48:06 +01:00
Revert "Prevent windows from drifting on restart."
This reverts commit 3cd382bccc.
Conflicts:
src/window.c
This commit is contained in:
25
src/window.c
25
src/window.c
@@ -1140,7 +1140,11 @@ WWindow *wManageWindow(WScreen *scr, Window window)
|
|||||||
y -= wwin->frame->top_width + wwin->frame->bottom_width;
|
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;
|
WMRect rect;
|
||||||
WArea usableArea;
|
WArea usableArea;
|
||||||
int head;
|
int head;
|
||||||
@@ -1153,21 +1157,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
|
|||||||
head = wGetHeadForRect(scr, rect);
|
head = wGetHeadForRect(scr, rect);
|
||||||
usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
|
usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
|
||||||
|
|
||||||
/* wWindowConfigure() will account for the frame
|
if (x >= usableArea.x1 + 2 * FRAME_BORDER_WIDTH)
|
||||||
* when placing so the window would be shifted without
|
x -= 2 * FRAME_BORDER_WIDTH;
|
||||||
* the adjustment below */
|
if (y >= usableArea.y1 + 2 * FRAME_BORDER_WIDTH)
|
||||||
if (y >= usableArea.y1 + wwin->frame->top_width)
|
y -= 2 * FRAME_BORDER_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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user